Sfoglia il codice sorgente

Removes the Nirvanix Service component, as the Nirvanix service shut down in October 2013.

Martin Hujer 12 anni fa
parent
commit
ade30cfcec
45 ha cambiato i file con 8 aggiunte e 3190 eliminazioni
  1. 2 0
      README.md
  2. 0 1
      documentation/manual/de/module_specs/Zend_Service.xml
  3. 0 364
      documentation/manual/de/module_specs/Zend_Service_Nirvanix.xml
  4. 0 1
      documentation/manual/en/manual-print2.xml.in
  5. 0 5
      documentation/manual/en/manual.xml.in
  6. 0 65
      documentation/manual/en/module_specs/Zend_Cloud_StorageService.xml
  7. 0 6
      documentation/manual/en/module_specs/Zend_Service.xml
  8. 0 357
      documentation/manual/en/module_specs/Zend_Service_Nirvanix.xml
  9. 0 83
      documentation/manual/en/ref/requirements-dependencies-table.xml
  10. 0 12
      documentation/manual/en/ref/requirements-zendcomponents-table.xml
  11. 0 73
      documentation/manual/es/ref/requirements-dependencies-table.xml
  12. 0 11
      documentation/manual/es/ref/requirements-zendcomponents-table.xml
  13. 1 7
      documentation/manual/fr/module_specs/Zend_Service.xml
  14. 0 36
      documentation/manual/he/ref/requirements.xml
  15. 0 83
      documentation/manual/hu/ref/requirements-dependencies-table.xml
  16. 0 12
      documentation/manual/hu/ref/requirements-zendcomponents-table.xml
  17. 0 18
      documentation/manual/id/ref/requirements.xml
  18. 0 6
      documentation/manual/ja/module_specs/Zend_Service.xml
  19. 0 377
      documentation/manual/ja/module_specs/Zend_Service_Nirvanix.xml
  20. 0 18
      documentation/manual/pl/ref/requirements.xml
  21. 0 6
      documentation/manual/pt-br/module_specs/Zend_Service.xml
  22. 0 399
      library/Zend/Cloud/StorageService/Adapter/Nirvanix.php
  23. 0 107
      library/Zend/Service/Nirvanix.php
  24. 0 36
      library/Zend/Service/Nirvanix/Exception.php
  25. 0 172
      library/Zend/Service/Nirvanix/Namespace/Base.php
  26. 0 105
      library/Zend/Service/Nirvanix/Namespace/Imfs.php
  27. 0 123
      library/Zend/Service/Nirvanix/Response.php
  28. 0 9
      tests/TestConfiguration.php.dist
  29. 0 6
      tests/Zend/Cloud/StorageService/Adapter/AllTests.php
  30. 0 108
      tests/Zend/Cloud/StorageService/Adapter/NirvanixTest.php
  31. 1 1
      tests/Zend/Cloud/StorageService/Adapter/RackspaceTest.php
  32. 0 23
      tests/Zend/Cloud/StorageService/FactoryTest.php
  33. 0 5
      tests/Zend/Cloud/StorageService/_files/config/nirvanix.ini
  34. 0 2
      tests/Zend/Service/AllTests.php
  35. 0 65
      tests/Zend/Service/Nirvanix/AllTests.php
  36. 0 44
      tests/Zend/Service/Nirvanix/ExceptionTest.php
  37. 0 81
      tests/Zend/Service/Nirvanix/FunctionalTestCase.php
  38. 0 50
      tests/Zend/Service/Nirvanix/Namespace/BaseTest.php
  39. 0 121
      tests/Zend/Service/Nirvanix/Namespace/ImfsTest.php
  40. 0 71
      tests/Zend/Service/Nirvanix/NirvanixTest.php
  41. 0 117
      tests/Zend/Service/Nirvanix/ResponseTest.php
  42. 1 1
      tests/Zend/Service/Rackspace/AllTests.php
  43. 1 1
      tests/Zend/Service/Rackspace/Files/AllTests.php
  44. 1 1
      tests/Zend/Service/Rackspace/Servers/AllTests.php
  45. 1 1
      tests/runtests.sh

+ 2 - 0
README.md

@@ -17,6 +17,8 @@ IMPORTANT FIXES FOR 1.12.4
   helper, as the TinySrc service no longer exists.
 - [#222](https://github.com/zendframework/zf1/pull/222) removes the InfoCard
   component, as the CardSpace service no longer exists.
+- [#271](https://github.com/zendframework/zf1/pull/271) removes the Nirvanix
+  component, as the Nirvanix service shut down in October 2013.
 
 IMPORTANT FIXES FOR 1.12.3
 --------------------------

+ 0 - 1
documentation/manual/de/module_specs/Zend_Service.xml

@@ -32,7 +32,6 @@
         <listitem><para><link linkend="zend.service.delicious">Del.icio.us</link></para></listitem>
         <listitem><para><link linkend="zend.service.flickr">Flickr</link></para></listitem>
         <listitem><para><link linkend="zend.service.livedocx">LiveDocx</link></para></listitem>
-        <listitem><para><link linkend="zend.service.nirvanix">Nirvanix</link></para></listitem>
         <listitem><para><link linkend="zend.service.recaptcha">ReCaptcha</link></para></listitem>
         <listitem><para><link linkend="zend.service.slideshare">SlideShare</link></para></listitem>
         <listitem><para><link linkend="zend.service.strikeiron">StrikeIron</link></para></listitem>

+ 0 - 364
documentation/manual/de/module_specs/Zend_Service_Nirvanix.xml

@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- EN-Revision: 24249 -->
-<!-- Reviewed: no -->
-<sect1 id="zend.service.nirvanix">
-    <title>Zend_Service_Nirvanix</title>
-
-    <sect2 id="zend.service.nirvanix.introduction">
-        <title>Einführung</title>
-
-        <para>
-            Nirvanix bietet ein Internet Media File System (IMFS), einen Internet Speicher Service
-            der es Anwendungen erlaubt Dateien hochzuladen, zu speichern, zu organisieren und
-            nachhaltig auf Sie zuzugreifen durch Verwendung eines Standard Web Service Interfaces.
-            Ein IMFS ist ein verteiltes geclustertes Dateisystem, auf das über das Internet
-            zugegriffen wird, und das für die Handhabung mit Mediendateien (Audio, Video, usw.)
-            optimiert ist. Das Ziel eines IMFA ist es massive Skalarität zu bieten um den
-            Problemen des Wachstums der Medienspeicher Herr zu werden, mit garantiertem Zugriff und
-            Erreichbarkeit unabhängig von Zeit und Ort. Letztendlich, gibt eine IMFS Anwendung die
-            Möglichkeit auf Daten sicher zuzugreifen, ohne die großen Fixkosten die mit der
-            Beschaffung und Einrichtung von physikalischen Speicherbänken verbunden sind.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.registering">
-        <title>Registrierung bei Nirvanix</title>
-
-        <para>
-            Bevor man mit <classname>Zend_Service_Nirvanix</classname> beginnt, muß man sich zuerst
-            für einen Account anmelden. Bitte sehen Sie auf die
-            <ulink url="http://www.nirvanix.com/gettingStarted.aspx">Wie man anfängt</ulink> Seite
-            auf der Nirvanix Webseite für weitere Informationen.
-        </para>
-
-        <para>
-            Nach der Registrierung erhält man einen Benutzernamen, ein Passwort und einen
-            Anwendungsschlüssel. Alle drei werden benötigt um
-            <classname>Zend_Service_Nirvanix</classname> zu verwenden.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.apiDocumentation">
-        <title>API Dokumentation</title>
-
-        <para>
-            Der Zugriff auf Nirvanix IMFS ist durch beide, sowohl ein <acronym>SOAP</acronym> als
-            auch ein schnelleres REST Service möglich. <classname>Zend_Service_Nirvanix</classname>
-            bietet einen relativ dünnen <acronym>PHP</acronym> 5 Wrapper um das REST Service.
-        </para>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> zielt darauf ab das Nirvanix REST Service
-            einfacher zu verwenden aber zu verstehen dass das Service selbst trotzdem noch
-            essentiell ist um mit Nirvanix erfolgreich zu sein.
-        </para>
-
-        <para>
-            Die <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html">Nirvanix
-                <acronym>API</acronym> Dokumentation</ulink> bietet eine Übersicht sowie detailierte
-            Informationen über die Verwendung des Services. Bitte machen Sie sich mit diesem
-            Dokument vertraut und referieren Sie darauf wenn Sie
-            <classname>Zend_Service_Nirvanix</classname> verwenden.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.features">
-        <title>Features</title>
-
-        <para>
-            Nirvanix's REST Service kann mit <acronym>PHP</acronym> effektiv verwendet werden
-            alleine mit Hilfe der <ulink url="http://www.php.net/simplexml">SimpleXML</ulink>
-            Erweiterung und <classname>Zend_Http_Client</classname>. Trotzdem ist deren Verwendung
-            auf diesem Weg irgendwie unbequem wegen der wiederholenden Operationen, wie die Übergabe
-            des Session Tokens bei jeder Anfrage und der wiederholten Prüfung des Antwort Bodys nach
-            Fehlercodes.
-        </para>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> bietet die folgenden Funktionalitäten:
-
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        Einen einzelnen Punkt für die Konfiguration der Nirvanix Authentifizierungs
-                        Daten die mit den Nirvanix Namespaces verwendet werden können.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Ein Proxy Objekt das viel bequemer ist als ein <acronym>HTTP</acronym>
-                        Client alleine, hauptsächlich wird die Notwendigkeit entfernt die
-                        <acronym>HTTP</acronym> POST Anfrage manuell zu erstellen um auf das REST
-                        Service zugreifen zu können.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Ein verantwortlicher Wrapper der jeden Antwortbody parst und eine Ausnahme
-                        wirft wenn ein Fehler aufgetreten ist, was die Notwendigkeit mildert
-                        widerholt den Erfolg der vielen Kommandos zu prüfen.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Zusätzliche bequeme Methoden für einige oder die meisten üblichen
-                        Operationen.
-                    </para>
-                </listitem>
-            </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.storing-your-first">
-        <title>Der Anfang</title>
-
-        <para>
-            Sobald man in Nirvanix registriert ist, ist man bereit die ersten Datein am IMFS zu
-            speichern. Die üblichste Operation die man am IMFS benötigt ist der Erstellung einer
-            neuen Datei, das Herunterladen bestehender Dateien, und das Löschen einer Datei.
-            <classname>Zend_Service_Nirvanix</classname> bietet bequeme Methoden für diese drei
-            Operationen.
-        </para>
-
-        <programlisting language="php"><![CDATA[
-$auth = array('username' => 'Dein-Benutzername',
-              'password' => 'Dein-Passwort',
-              'appKey'   => 'Dein-App-Schlüssel');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$imfs->putContents('/foo.txt', 'zu speichernder Inhalt');
-
-echo $imfs->getContents('/foo.txt');
-
-$imfs->unlink('/foo.txt');
-]]></programlisting>
-
-        <para>
-            Der erste Schritt um <classname>Zend_Service_Nirvanix</classname> zu verwenden ist immer
-            sich gegenüber dem Service zu authentifizieren. Das wird durch die Übergabe der
-            Anmeldedaten an den Kontruktor von <classname>Zend_Service_Nirvanix</classname>, wie
-            oben, gemacht. Das assoziative Array wurd direkt an Nirvanix als POST Parameter
-            übergeben.
-        </para>
-
-        <para>
-            Nirvanix teilt seine WebService in <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999879">Namespaces</ulink>
-            auf. Jeder Namespace kapselt eine Gruppe von zusammengehörenden Operationen. Nachdem
-            man eine Instanz von <classname>Zend_Service_Nirvanix</classname> erhalten hat, muß die
-            <methodname>getService()</methodname> Methode aufgerufen werden um einen Proxy für den
-            Namespace zu erhalten den man verwenden will. Oben wird ein Proxy für den
-            <constant>IMFS</constant> Namespace erstellt.
-        </para>
-
-        <para>
-            Nachdem man den Proxy für den Namespace hat den man verwenden will, muß die Methode auf
-            Ihm aufgerufen werden. Der Proxy erlaubt es jedes Kommando zu verwenden das in der
-            REST <acronym>API</acronym> vorhanden ist. Der Proxy kann auch bequeme Methoden
-            verfügbar machen, welche Kommandos des Web Services wrappen. Das obige Beispiel zeigt
-            die Verwendung der bequemen IMFS Methoden um eine neue Datei zu erstellen, sie zu
-            empfangen, diese Datei anzuzeigen und letztendlich die Datei zu löschen.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.understanding-proxy">
-        <title>Den Proxy verstehen</title>
-
-        <para>
-            Im vorherigen Beispiel wurde die <methodname>getService()</methodname> Methode verwendet
-            um ein Proxy Objekt zum <constant>IMFS</constant> Namespace zurückzugeben. Das Proxy
-            Objekt erlaubt es das Nirvanix REST Service in einer Art zu verwenden die näher daran
-            ist wie normalerweise ein <acronym>PHP</acronym> Methodenaufruf durchgeführt wird,
-            gegenüber der Erstellung von eigenen <acronym>HTTP</acronym> Anfrage Objekten.
-        </para>
-
-        <para>
-            Ein Proxy Objekt kann bequeme Methoden enthalten. Das sind Methoden die
-            <classname>Zend_Service_Nirvanix</classname> bietet um die Verwendung der Nirvanix Web
-            Services zu vereinfachen. Im vorigen Beispiel haben die Methoden
-            <methodname>putContents()</methodname>, <methodname>getContents()</methodname>, und
-            <methodname>unlink()</methodname> keine direkte Entsprechungen in der REST
-            <acronym>API</acronym>. Das sind bequeme Methoden die von
-            <classname>Zend_Service_Nirvanix</classname> angeboten werden um viel komplexere
-            Operationen der REST <acronym>API</acronym> zu abstrahieren.
-        </para>
-
-        <para>
-            Für alle anderen Methodenaufrufe zum Proxy Objekt konvertiert der Proxy dynamisch den
-            Methodenaufruf in die entsprechende <acronym>HTTP</acronym> POST Anfrage zur REST
-            <acronym>API</acronym>. Hierbei wird der Name der Methode als <acronym>API</acronym>
-            Kommando verwendet, und ein assoziatives Array im ersten Argument als POST Parameter.
-        </para>
-
-        <para>
-            Nehmen wir an das wir die REST <acronym>API</acronym> Methode <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999923">RenameFile</ulink>
-            aufrufen wollen welche keine bequeme Methode in
-            <classname>Zend_Service_Nirvanix</classname> besitzen:
-        </para>
-
-        <programlisting language="php"><![CDATA[
-$auth = array('username' => 'Dein-Benutzername',
-              'password' => 'Dein-Passwort',
-              'appKey'   => 'Dein-App-Schlüssel');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$result = $imfs->renameFile(array('filePath' => '/path/to/foo.txt',
-                                  'newFileName' => 'bar.txt'));
-]]></programlisting>
-
-        <para>
-            Oben wird ein Proxy für den <constant>IMFS</constant> erstellt. Eine Methode,
-            <methodname>renameFile()</methodname>, wird dann vom Proxy aufgerufen. Diese Methode
-            existiert nicht als bequeme Methode im <acronym>PHP</acronym> Code, deswegen wird Sie
-            durch <methodname>__call()</methodname> gefangen und in eine POST Anfrage für die REST
-            <acronym>API</acronym> umgewandelt wo das assoziative Array als POST Parameter verwendet
-            wird.
-        </para>
-
-        <para>
-            Es ist in der Nirvanix <acronym>API</acronym> Dokumentation zu beachten das
-            <code>sessionToken</code> für diese Methode benötigt wird, wir dieses aber nicht an das
-            Proxy Objekt übbergeben haben. Es wird, der Bequemlichkeit halber, automatisch
-            hinzugefügt.
-        </para>
-
-        <para>
-            Das Ergebnis dieser Operation ist entweder ein
-            <classname>Zend_Service_Nirvanix_Response</classname> Objekt welches das von Nirvanix
-            zurückgegebene <acronym>XML</acronym> wrappt, oder
-            <classname>Zend_Service_Nirvanix_Exception</classname> wenn ein Fehler aufgetreten ist.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.examining-results">
-        <title>Ergebnisse erkunden</title>
-
-        <para>
-            Die Nirvanix REST <acronym>API</acronym> gibt Ihre Ergebnisse immer in einem
-            <acronym>XML</acronym> zurück. <classname>Zend_Service_Nirvanix</classname> parst dieses
-            <acronym>XML</acronym> mit der <code>SimpleXML</code> Erweiterung und dekoriert dann das
-            sich ergebende <code>SimpleXMLElement</code> mit einem
-            <classname>Zend_Service_Nirvanix_Response</classname> Objekt.
-        </para>
-
-        <para>
-            Der einfachste Weg ein Ergebnis vom service zu betrachten ist die Verwendung der
-            in <acronym>PHP</acronym> eingebauten Funktionen wie <methodname>print_r()</methodname>:
-        </para>
-
-        <programlisting language="php"><![CDATA[
-<?php
-$auth = array('username' => 'Dein-Benutzername',
-              'password' => 'Dein-Passwort',
-              'appKey'   => 'Dein-App-Schlüssel');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$result = $imfs->putContents('/foo.txt', 'Vierzehn Bytes');
-print_r($result);
-?>
-
-Zend_Service_Nirvanix_Response Object
-(
-    [_sxml:protected] => SimpleXMLElement Object
-        (
-            [ResponseCode] => 0
-            [FilesUploaded] => 1
-            [BytesUploaded] => 14
-        ))
-]]></programlisting>
-
-        <para>
-            Auf jede Eigenschaft oder Methode des dekorierten <code>SimpleXMLElement</code>s kann
-            zugegriffen werden. Im obigen Beispiel, könnte <code>$result->BytesUploaded</code>
-            verwendet werden um die anzahl von empfangenen Bytes zu sehen. Sollte man auf das
-            <code>SimpleXMLElement</code> direkt zugreifen wollen, kann einfach
-            <code>$result->getSxml()</code> verwendet werden.
-        </para>
-
-        <para>
-            Die üblichste Antwort von Nirvanix ist Erfolg (<code>ResponseCode</code> von Null).
-            Es ist normalerweise nicht notwendig <code>ResponseCode</code> zu prüfen weil jedes
-            nicht-null Ergebnis eine <classname>Zend_Service_Nirvanix_Exception</classname> wirft.
-            Siehe das nächste Kapitel über die Behandlung von Fehlern.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.handling-errors">
-        <title>Fehler behandeln</title>
-
-        <para>
-            Wenn Nirvanix verwendet wird, ist es wichtig Fehler zu vermeiden die vom Service
-            zurückgegeben werden können und diese entsprechend zu behandeln.
-        </para>
-
-        <para>
-            Alle Operationen gegenüber dem REST Service ergeben einen <acronym>XML</acronym>
-            RückgabePayload der ein <code>ResponseCode</code> Element, wie im folgenden Beispiel,
-            enthält:
-        </para>
-
-        <programlisting language="xml"><![CDATA[
-<Response>
-    <ResponseCode>0</ResponseCode>
-</Response>
-]]></programlisting>
-
-        <para>
-            Wenn <code>ResponseCode</code> Null ist, wie im obigen Beispiel,  war die Operation
-            erfolgreich. Wenn die Operation nicht erfolgreich war, ist <code>ResponseCode</code>
-            nicht-Null und ein <code>ErrorMessage</code> Element sollte vorhanden sein.
-        </para>
-
-        <para>
-            Um die Notwendigkeit zu verringern immer zu Prüfen ob <code>ResponseCode</code> Null
-            ist, prüft <classname>Zend_Service_Nirvanix</classname> automatisch jede von Nirvanix
-            zurückgegebene Antwort. Wenn <code>ResponseCode</code> einen Fehler zeigt, wird eine
-            <classname>Zend_Service_Nirvanix_Exception</classname> geworfen.
-        </para>
-
-      <programlisting language="xml"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-$nirvanix = new Zend_Service_Nirvanix($auth);
-
-try {
-
-  $imfs = $nirvanix->getService('IMFS');
-  $imfs->unlink('/a-nonexistant-path');
-
-} catch (Zend_Service_Nirvanix_Exception $e) {
-  echo $e->getMessage() . "\n";
-  echo $e->getCode();
-}
-]]></programlisting>
-
-        <para>
-            im obigen Beispiel ist <methodname>unlink()</methodname> eine bequeme Methode die das
-            <code>DeleteFiles</code> der REST <acronym>API</acronym> wrappt. Der
-            <code>filePath</code> Parameter wird vom <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999918">DeleteFiles</ulink>
-            Kommando benötigt und enthält einen Pfad der nicht existiert. Das wird in einer
-            <classname>Zend_Service_Nirvanix</classname> Ausnahme resultieren die, mit der Nachricht
-            "Invalid Path" und Code 70005, geworfen wird.
-        </para>
-
-        <para>
-            Die <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html">Nirvanix
-                <acronym>API</acronym> Dokumentation</ulink> beschreibt die mit jedem Kommando
-            assoziierten Fehler. Abhängig von den eigenen Bedürfnissen kann jedes Kommando in einen
-            <code>try</code> Block eingebettet werden oder aus Bequemlichkeit, viele Kommandos im
-            selben <code>try</code> Block.
-        </para>
-    </sect2>
-</sect1>

+ 0 - 1
documentation/manual/en/manual-print2.xml.in

@@ -195,7 +195,6 @@
         <xi:include href="module_specs/Zend_Service_Audioscrobbler.xml" />
         <xi:include href="module_specs/Zend_Service_Delicious.xml" />
         <xi:include href="module_specs/Zend_Service_Flickr.xml" />
-        <xi:include href="module_specs/Zend_Service_Nirvanix.xml" />
         <xi:include href="module_specs/Zend_Service-ReCaptcha.xml" />
         <xi:include href="module_specs/Zend_Service_SlideShare.xml" />
         <xi:include href="module_specs/Zend_Service_StrikeIron-Overview.xml" />

+ 0 - 5
documentation/manual/en/manual.xml.in

@@ -1967,11 +1967,6 @@
                     <xi:include href="../en/module_specs/Zend_Service_LiveDocx.xml" />
                 </xi:fallback>
             </xi:include>
-            <xi:include href="module_specs/Zend_Service_Nirvanix.xml">
-                <xi:fallback>
-                    <xi:include href="../en/module_specs/Zend_Service_Nirvanix.xml" />
-                </xi:fallback>
-            </xi:include>
             <xi:include href="module_specs/Zend_Service_Rackspace.xml">
                 <xi:fallback>
                     <xi:include href="../en/module_specs/Zend_Service_Rackspace.xml" />

+ 0 - 65
documentation/manual/en/module_specs/Zend_Cloud_StorageService.xml

@@ -35,13 +35,6 @@
 
             <listitem>
                 <para>
-                    <ulink
-                        url="http://developer.nirvanix.com/sitefiles/1000/API.html"><classname>Zend_Cloud_StorageService_Adapter_Nirvanix</classname></ulink>
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
                     <classname>Zend_Cloud_StorageService_Adapter_FileSystem</classname>
                 </para>
             </listitem>
@@ -339,64 +332,6 @@ $storage = Zend_Cloud_StorageService_Factory::getAdapter(array(
                 </tgroup>
             </table>
 
-            <table frame='all' id="zend.cloud.storageservice.options.nirvanix">
-                <title>Zend_Cloud_StorageService_Adapter_Nirvanix options</title>
-
-                <tgroup cols="5">
-                    <thead>
-                        <row>
-                            <entry>Option key</entry>
-                            <entry>Description</entry>
-                            <entry>Used in</entry>
-                            <entry>Required</entry>
-                            <entry>Default</entry>
-                        </row>
-                    </thead>
-
-                    <tbody>
-                        <row>
-                            <entry>auth_username</entry>
-                            <entry>Nirvanix user name</entry>
-                            <entry>Constructor</entry>
-                            <entry>Yes</entry>
-                            <entry>None</entry>
-                        </row>
-
-                        <row>
-                            <entry>auth_password</entry>
-                            <entry>Nirvanix password</entry>
-                            <entry>Constructor</entry>
-                            <entry>Yes</entry>
-                            <entry>None</entry>
-                        </row>
-
-                        <row>
-                            <entry>auth_accesskey</entry>
-                            <entry>Nirvanix access key</entry>
-                            <entry>Constructor</entry>
-                            <entry>Yes</entry>
-                            <entry>None</entry>
-                        </row>
-
-                        <row>
-                            <entry>http_adapter</entry>
-                            <entry>HTTP adapter to use in all access operations</entry>
-                            <entry>Constructor</entry>
-                            <entry>No</entry>
-                            <entry><classname>Zend_Http_Client_Adapter_Socket</classname></entry>
-                        </row>
-
-                        <row>
-                            <entry>remote_directory</entry>
-                            <entry>Nirvanix directory to use</entry>
-                            <entry>Constructor (mandatory)</entry>
-                            <entry>Yes</entry>
-                            <entry>None</entry>
-                        </row>
-                    </tbody>
-                </tgroup>
-            </table>
-
             <table frame='all' id="zend.cloud.storageservice.options.filesystem">
                 <title>Zend_Cloud_StorageService_Adapter_Filesystem options</title>
 

+ 0 - 6
documentation/manual/en/module_specs/Zend_Service.xml

@@ -65,12 +65,6 @@
 
         <listitem>
             <para>
-                <link linkend="zend.service.nirvanix">Nirvanix</link>
-            </para>
-        </listitem>
-
-        <listitem>
-            <para>
                 <link linkend="zend.service.recaptcha">ReCaptcha</link>
             </para>
         </listitem>

+ 0 - 357
documentation/manual/en/module_specs/Zend_Service_Nirvanix.xml

@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Reviewed: no -->
-<sect1 id="zend.service.nirvanix">
-    <title>Zend_Service_Nirvanix</title>
-
-    <sect2 id="zend.service.nirvanix.introduction">
-        <title>Introduction</title>
-
-        <para>
-            Nirvanix provides an Internet Media File System (IMFS), an
-            Internet storage service that allows applications to upload, store and
-            organize files and subsequently access them using a standard Web
-            Services interface. An IMFS is distributed clustered file system,
-            accessed over the Internet, and optimized for dealing with media files
-            (audio, video, etc). The goal of an IMFS is to provide massive
-            scalability to deal with the challenges of media storage growth, with
-            guaranteed access and availability regardless of time and location.
-            Finally, an IMFS gives applications the ability to access data
-            securely, without the large fixed costs associated with acquiring and
-            maintaining physical storage assets.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.registering">
-        <title>Registering with Nirvanix</title>
-
-        <para>
-            Before you can get started with <classname>Zend_Service_Nirvanix</classname>, you must
-            first register for an account. Please see the
-            <ulink url="http://www.nirvanix.com/gettingStarted.aspx">Getting Started</ulink>
-            page on the Nirvanix website for more information.
-        </para>
-
-        <para>
-            After registering, you will receive a Username, Password, and Application Key.
-            All three are required to use <classname>Zend_Service_Nirvanix</classname>.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.apiDocumentation">
-        <title>API Documentation</title>
-
-        <para>
-            Access to the Nirvanix IMFS is available through both <acronym>SOAP</acronym> and a
-            faster REST service. <classname>Zend_Service_Nirvanix</classname> provides a
-            relatively thin <acronym>PHP</acronym> 5 wrapper around the REST service.
-        </para>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> aims to make using the Nirvanix REST
-            service easier but understanding the service itself is still essential to be successful
-            with Nirvanix.
-        </para>
-
-        <para>
-            The <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html">Nirvanix
-            <acronym>API</acronym> Documentation</ulink> provides an overview as well as detailed
-            information using the service. Please familiarize yourself with this document and refer
-            back to it as you use <classname>Zend_Service_Nirvanix</classname>.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.features">
-        <title>Features</title>
-
-        <para>
-            Nirvanix's REST service can be used effectively with <acronym>PHP</acronym> using the
-            <ulink url="http://www.php.net/simplexml">SimpleXML</ulink>
-            extension and <classname>Zend_Http_Client</classname> alone. However, using it this way
-            is somewhat inconvenient due to repetitive operations like passing the
-            session token on every request and repeatedly checking the response body for
-            error codes.
-        </para>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> provides the following functionality:
-
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        A single point for configuring your Nirvanix authentication
-                        credentials that can be used across the Nirvanix namespaces.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        A proxy object that is more convenient to use than an
-                        <acronym>HTTP</acronym> client alone, mostly removing the need to manually
-                        construct <acronym>HTTP</acronym> POST requests to access the REST service.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        A response wrapper that parses each response body and throws an
-                        exception if an error occurred, alleviating the need to repeatedly
-                        check the success of many commands.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Additional convenience methods for some of the more common operations.
-                    </para>
-                </listitem>
-            </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.storing-your-first">
-        <title>Getting Started</title>
-
-        <para>
-            Once you have registered with Nirvanix, you're ready to store your first
-            file on the IMFS. The most common operations that you will need to do
-            on the IMFS are creating a new file, downloading an existing file, and
-            deleting a file. <classname>Zend_Service_Nirvanix</classname> provides convenience
-            methods for these three operations.
-        </para>
-
-        <programlisting language="php"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$imfs->putContents('/foo.txt', 'contents to store');
-
-echo $imfs->getContents('/foo.txt');
-
-$imfs->unlink('/foo.txt');
-]]></programlisting>
-
-        <para>
-            The first step to using <classname>Zend_Service_Nirvanix</classname> is always
-            to authenticate against the service. This is done by passing your
-            credentials to the <classname>Zend_Service_Nirvanix</classname> constructor
-            above. The associative array is passed directly to Nirvanix as POST
-            parameters.
-        </para>
-
-        <para>
-            Nirvanix divides its web services into <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999879">namespaces</ulink>.
-            Each namespace encapsulates a group of related operations. After getting
-            an instance of <classname>Zend_Service_Nirvanix</classname>, call the
-            <methodname>getService()</methodname> method to create a proxy for the namespace
-            you want to use. Above, a proxy for the <constant>IMFS</constant> namespace is created.
-        </para>
-
-        <para>
-            After you have a proxy for the namespace you want to use, call methods on it. The
-            proxy will allow you to use any command available on the REST <acronym>API</acronym>.
-            The proxy may also make convenience methods available, which wrap web service
-            commands. The example above shows using the IMFS convenience methods to create a
-            new file, retrieve and display that file, and finally delete the file.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.understanding-proxy">
-        <title>Understanding the Proxy</title>
-
-        <para>
-            In the previous example, we used the <methodname>getService()</methodname> method to
-            return a proxy object to the <constant>IMFS</constant> namespace. The proxy object
-            allows you to use the Nirvanix REST service in a way that's closer to making a normal
-            <acronym>PHP</acronym> method call, as opposed to constructing your own
-            <acronym>HTTP</acronym> request objects.
-        </para>
-
-        <para>
-            A proxy object may provide convenience methods. These are methods that the
-            <classname>Zend_Service_Nirvanix</classname> provides to simplify the use of
-            the Nirvanix web services. In the previous example, the methods
-            <methodname>putContents()</methodname>, <methodname>getContents()</methodname>, and
-            <methodname>unlink()</methodname> do not have direct equivalents in the REST
-            <acronym>API</acronym>. They are convenience methods provided by
-            <classname>Zend_Service_Nirvanix</classname> that abstract more complicated operations
-            on the REST <acronym>API</acronym>.
-        </para>
-
-        <para>
-            For all other method calls to the proxy object, the proxy will dynamically convert the
-            method call to the equivalent <acronym>HTTP</acronym> POST request to the REST
-            <acronym>API</acronym>. It does this by using the method name as the
-            <acronym>API</acronym> command, and an associative array in the first argument as the
-            POST parameters.
-        </para>
-
-        <para>
-            Let's say you want to call the REST <acronym>API</acronym> method <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999923">RenameFile</ulink>,
-            which does not have a convenience method in
-            <classname>Zend_Service_Nirvanix</classname>:
-        </para>
-
-        <programlisting language="php"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$result = $imfs->renameFile(array('filePath' => '/path/to/foo.txt',
-                                  'newFileName' => 'bar.txt'));
-]]></programlisting>
-
-        <para>
-            Above, a proxy for the <constant>IMFS</constant> namespace is created. A method,
-            <methodname>renameFile()</methodname>, is then called on the proxy. This method does not
-            exist as a convenience method in the <acronym>PHP</acronym> code, so it is trapped by
-            <methodname>__call()</methodname> and converted into a POST request to the REST
-            <acronym>API</acronym> where the associative array is used as the POST parameters.
-        </para>
-
-        <para>
-            Notice in the Nirvanix <acronym>API</acronym> documentation that
-            <code>sessionToken</code> is required for this method but we did not give it to the
-            proxy object. It is added automatically for your convenience.
-        </para>
-
-        <para>
-            The result of this operation will either be a
-            <classname>Zend_Service_Nirvanix_Response</classname> object wrapping the
-            <acronym>XML</acronym> returned by Nirvanix, or a
-            <classname>Zend_Service_Nirvanix_Exception</classname> if an error occurred.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.examining-results">
-        <title>Examining Results</title>
-
-        <para>
-            The Nirvanix REST <acronym>API</acronym> always returns its results in
-            <acronym>XML</acronym>. <classname>Zend_Service_Nirvanix</classname> parses this
-            <acronym>XML</acronym> with the <code>SimpleXML</code> extension and then decorates the
-            resulting <code>SimpleXMLElement</code> with a
-            <classname>Zend_Service_Nirvanix_Response</classname> object.
-        </para>
-
-        <para>
-            The simplest way to examine a result from the service is to use the
-            built-in <acronym>PHP</acronym> functions like <methodname>print_r()</methodname>:
-        </para>
-
-        <programlisting language="php"><![CDATA[
-<?php
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$result = $imfs->putContents('/foo.txt', 'fourteen bytes');
-print_r($result);
-?>
-
-Zend_Service_Nirvanix_Response Object
-(
-    [_sxml:protected] => SimpleXMLElement Object
-        (
-            [ResponseCode] => 0
-            [FilesUploaded] => 1
-            [BytesUploaded] => 14
-        )
-)
-]]></programlisting>
-
-        <para>
-            You can access any property or method of the decorated <code>SimpleXMLElement</code>.
-            In the above example, <code>$result->BytesUploaded</code> could be used to see the
-            number of bytes received. Should you want to access the <code>SimpleXMLElement</code>
-            directly, just use <code>$result->getSxml()</code>.
-        </para>
-
-        <para>
-            The most common response from Nirvanix is success (<code>ResponseCode</code> of zero).
-            It is not normally necessary to check <code>ResponseCode</code> because any non-zero
-            result will throw a <classname>Zend_Service_Nirvanix_Exception</classname>. See the next
-            section on handling errors.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.handling-errors">
-        <title>Handling Errors</title>
-
-        <para>
-            When using Nirvanix, it's important to anticipate errors that can be returned
-            by the service and handle them appropriately.
-        </para>
-
-        <para>
-            All operations against the REST service result in an <acronym>XML</acronym> return
-            payload that contains a <code>ResponseCode</code> element, such as the following
-            example:
-        </para>
-
-        <programlisting language="xml"><![CDATA[
-<Response>
-   <ResponseCode>0</ResponseCode>
-</Response>
-]]></programlisting>
-
-        <para>
-            When the <code>ResponseCode</code> is zero such as in the example
-            above, the operation was successful. When the operation is not
-            successful, the <code>ResponseCode</code> is non-zero and an
-            <code>ErrorMessage</code> element should be present.
-        </para>
-
-        <para>
-            To alleviate the need to repeatedly check if the <code>ResponseCode</code>
-            is non-zero, <classname>Zend_Service_Nirvanix</classname> automatically checks each
-            response returned by Nirvanix. If the <code>ResponseCode</code> indicates an
-            error, a <classname>Zend_Service_Nirvanix_Exception</classname> will be thrown.
-        </para>
-
-        <programlisting language="xml"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-$nirvanix = new Zend_Service_Nirvanix($auth);
-
-try {
-
-  $imfs = $nirvanix->getService('IMFS');
-  $imfs->unlink('/a-nonexistant-path');
-
-} catch (Zend_Service_Nirvanix_Exception $e) {
-  echo $e->getMessage() . "\n";
-  echo $e->getCode();
-}
-]]></programlisting>
-
-        <para>
-            In the example above, <methodname>unlink()</methodname> is a convenience method that
-            wraps the <code>DeleteFiles</code> command on the REST <acronym>API</acronym>. The
-            <code>filePath</code> parameter required by the <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999918">DeleteFiles</ulink>
-            command contains a path that does not exist. This will result in a
-            <classname>Zend_Service_Nirvanix</classname> exception being thrown with the message
-            "Invalid path" and code 70005.
-        </para>
-
-        <para>
-            The <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html">Nirvanix
-            <acronym>API</acronym> Documentation</ulink> describes the errors associated with each
-            command. Depending on your needs, you may wrap each command in a <code>try</code> block
-            or wrap many commands in the same <code>try</code> block for convenience.
-        </para>
-    </sect2>
-</sect1>

+ 0 - 83
documentation/manual/en/ref/requirements-dependencies-table.xml

@@ -4265,89 +4265,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="8" valign="middle">
-                    <emphasis>
-                        <ulink
-                            url="&zf.manual.link;/zend.service.nirvanix.html">
-                            <classname>Zend_Service_Nirvanix</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="2" valign="middle">&requirements.hard;</entry>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.exception.html">
-                        <classname>Zend_Exception</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.http.html">
-                        <classname>Zend_Http</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.loader.html">
-                        <classname>Zend_Loader</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">&requirements.fix;</entry>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.locale.html">
-                        <classname>Zend_Locale</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.uri.html">
-                        <classname>Zend_Uri</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.validate.html">
-                        <classname>Zend_Validate</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">&requirements.sub;</entry>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.date.html">
-                        <classname>Zend_Date</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.filter.html">
-                        <classname>Zend_Filter</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.registry.html">
-                        <classname>Zend_Registry</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
                 <entry morerows="10" valign="middle">
                     <emphasis>
                         <ulink

+ 0 - 12
documentation/manual/en/ref/requirements-zendcomponents-table.xml

@@ -982,18 +982,6 @@
                 <entry>
                     <emphasis>
                         <ulink
-                            url="&zf.manual.link;/zend.service.nirvanix.html">
-                            <classname>Zend_Service_Nirvanix</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry>---</entry>
-                <entry>---</entry>
-            </row>
-            <row>
-                <entry>
-                    <emphasis>
-                        <ulink
                             url="&zf.manual.link;/zend.service.recaptcha.html">
                             <classname>Zend_Service_ReCaptcha</classname>
                         </ulink>

+ 0 - 73
documentation/manual/es/ref/requirements-dependencies-table.xml

@@ -3713,79 +3713,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="8" valign="middle">
-                    <emphasis>
-                        <ulink url="http://framework.zend.com/manual/en/zend.service.nirvanix.html">
-                            <classname>Zend_Service_Nirvanix</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="2" valign="middle">Hard</entry>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.exception.html">
-                        <classname>Zend_Exception</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.http.html">
-                        <classname>Zend_Http</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.loader.html">
-                        <classname>Zend_Loader</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">Fix</entry>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.locale.html">
-                        <classname>Zend_Locale</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.uri.html">
-                        <classname>Zend_Uri</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.validate.html">
-                        <classname>Zend_Validate</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">Sub</entry>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.date.html">
-                        <classname>Zend_Date</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.filter.html">
-                        <classname>Zend_Filter</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.registry.html">
-                        <classname>Zend_Registry</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
                 <entry morerows="10" valign="middle">
                     <emphasis>
                         <ulink url="http://framework.zend.com/manual/en/zend.service.recapchta.html">

+ 0 - 11
documentation/manual/es/ref/requirements-zendcomponents-table.xml

@@ -819,17 +819,6 @@
             <row>
                 <entry>
                     <emphasis>
-                        <ulink url="http://framework.zend.com/manual/en/zend.service.nirvanix.html">
-                            <classname>Zend_Service_Nirvanix</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry>---</entry>
-                <entry>---</entry>
-            </row>
-            <row>
-                <entry>
-                    <emphasis>
                         <ulink url="http://framework.zend.com/manual/en/zend.service.recaptcha.html">
                             <classname>Zend_Service_ReCaptcha</classname>
                         </ulink>

+ 1 - 7
documentation/manual/fr/module_specs/Zend_Service.xml

@@ -67,12 +67,6 @@
 
         <listitem>
             <para>
-                <link linkend="zend.service.nirvanix">Nirvanix</link>
-            </para>
-        </listitem>
-
-        <listitem>
-            <para>
                 <link linkend="zend.service.recaptcha">ReCaptcha</link>
             </para>
         </listitem>
@@ -121,4 +115,4 @@
     </itemizedlist>
 
     <para>D'autres services devraient être ajoutés prochainement.</para>
-</sect1>
+</sect1>

+ 0 - 36
documentation/manual/he/ref/requirements.xml

@@ -1024,11 +1024,6 @@
                             <entry><ulink url="http://www.php.net/manual/en/ref.libxml.php"><code>libxml</code></ulink></entry>
                         </row>
                         <row>
-                            <entry><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.nirvanix.html"><code>Zend_Service_Nirvanix</code></ulink></emphasis></entry>
-                            <entry>---</entry>
-                            <entry>---</entry>
-                        </row>
-                        <row>
                             <entry><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.recaptcha.html"><code>Zend_Service_ReCaptcha</code></ulink></emphasis></entry>
                             <entry>תלוי מאוד</entry>
                             <entry><emphasis role="strong"><ulink url="http://www.php.net/manual/en/ref.mcrypt.php"><code>mcrypt</code></ulink></emphasis></entry>
@@ -2747,37 +2742,6 @@
                             <entry><ulink url="http://framework.zend.com/manual/en/zend.registry.html"><code>Zend_Registry</code></ulink></entry>
                         </row>
                         <row>
-                            <entry morerows="8" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.nirvanix.html"><code>Zend_Service_Nirvanix</code></ulink></emphasis></entry>
-                            <entry morerows="2" valign="middle">תלוי מאוד</entry>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.exception.html"><code>Zend_Exception</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.http.html"><code>Zend_Http</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.loader.html"><code>Zend_Loader</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry morerows="2" valign="middle">תיקון</entry>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.locale.html"><code>Zend_Locale</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.uri.html"><code>Zend_Uri</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.validate.html"><code>Zend_Validate</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry morerows="2" valign="middle">תת</entry>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.date.html"><code>Zend_Date</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.filter.html"><code>Zend_Filter</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.registry.html"><code>Zend_Registry</code></ulink></entry>
-                        </row>
-                        <row>
                             <entry morerows="10" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.recapchta.html"><code>Zend_Service_ReCaptcha</code></ulink></emphasis></entry>
                             <entry morerows="2" valign="middle">תלוי מאוד</entry>
                             <entry><ulink url="http://framework.zend.com/manual/en/zend.exception.html"><code>Zend_Exception</code></ulink></entry>

+ 0 - 83
documentation/manual/hu/ref/requirements-dependencies-table.xml

@@ -4215,89 +4215,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="8" valign="middle">
-                    <emphasis>
-                        <ulink
-                            url="http://framework.zend.com/manual/en/zend.service.nirvanix.html">
-                            <classname>Zend_Service_Nirvanix</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="2" valign="middle">Erős</entry>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.exception.html">
-                        <classname>Zend_Exception</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.http.html">
-                        <classname>Zend_Http</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.loader.html">
-                        <classname>Zend_Loader</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">Állandó</entry>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.locale.html">
-                        <classname>Zend_Locale</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.uri.html">
-                        <classname>Zend_Uri</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.validate.html">
-                        <classname>Zend_Validate</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">Al-</entry>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.date.html">
-                        <classname>Zend_Date</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.filter.html">
-                        <classname>Zend_Filter</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.registry.html">
-                        <classname>Zend_Registry</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
                 <entry morerows="10" valign="middle">
                     <emphasis>
                         <ulink

+ 0 - 12
documentation/manual/hu/ref/requirements-zendcomponents-table.xml

@@ -922,18 +922,6 @@
                 <entry>
                     <emphasis>
                         <ulink
-                            url="http://framework.zend.com/manual/en/zend.service.nirvanix.html">
-                            <classname>Zend_Service_Nirvanix</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry>–</entry>
-                <entry>–</entry>
-            </row>
-            <row>
-                <entry>
-                    <emphasis>
-                        <ulink
                             url="http://framework.zend.com/manual/en/zend.service.recaptcha.html">
                             <classname>Zend_Service_ReCaptcha</classname>
                         </ulink>

+ 0 - 18
documentation/manual/id/ref/requirements.xml

@@ -1038,12 +1038,6 @@
                         <entry><ulink url="http://www.php.net/manual/en/ref.libxml.php"><code>libxml</code></ulink></entry>
                     </row>
                     <row>
-                        <entry><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.nirvanix.html"><code>Zend_Service_Nirvanix</code></ulink></emphasis></entry>
-                        <entry>---</entry>
-                        <entry>---</entry>
-                        <entry>---</entry>
-                    </row>
-                    <row>
                         <entry><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html"><code>Zend_Service_SlideShare</code></ulink></emphasis></entry>
                         <entry>---</entry>
                         <entry>---</entry>
@@ -1592,17 +1586,6 @@
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.validate.html"><code>Zend_Validate</code></ulink></entry>
                     </row>
                     <row>
-                        <entry morerows="2" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.nirvanix.html"><code>Zend_Service_Nirvanix</code></ulink></emphasis></entry>
-                        <entry morerows="2" valign="middle">Hard</entry>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.exception.html"><code>Zend_Exception</code></ulink></entry>
-                    </row>
-                    <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.http.html"><code>Zend_Http</code></ulink></entry>
-                    </row>
-                    <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.loader.html"><code>Zend_Loader</code></ulink></entry>
-                    </row>
-                    <row>
                         <entry morerows="2" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html"><code>Zend_Service_SlideShare</code></ulink></emphasis></entry>
                         <entry morerows="2" valign="middle">Hard</entry>
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.cache.html"><code>Zend_Cache</code></ulink></entry>
@@ -1810,7 +1793,6 @@ Service_Amazon
 Service_Audioscrobbler
 Service_Delicious
 Service_Flickr
-Service_Nirvanix
 Service_SlideShare
 Service_StrikeIron
 Service_Technorati

+ 0 - 6
documentation/manual/ja/module_specs/Zend_Service.xml

@@ -61,12 +61,6 @@
 
         <listitem>
             <para>
-                <link linkend="zend.service.nirvanix">Nirvanix</link>
-            </para>
-        </listitem>
-
-        <listitem>
-            <para>
                 <link linkend="zend.service.recaptcha">ReCaptcha</link>
             </para>
         </listitem>

+ 0 - 377
documentation/manual/ja/module_specs/Zend_Service_Nirvanix.xml

@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Reviewed: no -->
-<!-- EN-Revision: 24249 -->
-<sect1 id="zend.service.nirvanix">
-    <title>Zend_Service_Nirvanix(日本語)</title>
-
-    <sect2 id="zend.service.nirvanix.introduction">
-        <title>導入</title>
-
-        <para>
-            Nirvanix は Internet Media File System (<acronym>IMFS</acronym>)
-            です。インターネット上のストレージサービスに対して
-            ファイルをアップロードして保存し、ファイルを管理します。
-            また、標準的なウェブサービスインターフェイスでファイルにアクセスできます。
-            <acronym>IMFS</acronym> はクラスタ形式のファイルシステムで、インターネット越しにアクセスします。
-            また、メディアファイル (音声や動画など) に最適化されています。
-            <acronym>IMFS</acronym> の目標は、ますます増えていくメディアストレージに対応する
-            スケーラビリティを提供すること、
-            そしていつでもどこでもそこにアクセスできることを保証することです。
-            最後に、<acronym>IMFS</acronym> を使用すればアプリケーションからデータに対して
-            セキュアにアクセスできるようになります。また、
-            物理的なストレージを確保したり保守したりするためのコストも回避できます。
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.registering">
-        <title>Nirvanix への登録</title>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> を使う前に、
-            まずアカウントを取得する必要があります。詳細な情報は、
-            Nirvanix のウェブサイトにある
-            <ulink url="http://www.nirvanix.com/gettingStarted.aspx">Getting Started</ulink>
-            を参照ください。
-        </para>
-
-        <para>
-            登録を済ませると、ユーザ名とパスワードそしてアプリケーションキーが得られます。
-            <classname>Zend_Service_Nirvanix</classname> を使うには、
-            これらすべてが必要となります。
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.apiDocumentation">
-        <title>API ドキュメント</title>
-
-        <para>
-            Nirvanix <acronym>IMFS</acronym> へのアクセス方法には、<acronym>SOAP</acronym> を使用する方法と
-            (より高速な) REST サービスを使用する方法があります。
-            <classname>Zend_Service_Nirvanix</classname>
-            は、REST サービスに対する比較的軽量な <acronym>PHP</acronym> 5 ラッパーを提供します。
-        </para>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> の狙いは
-            Nirvanix REST サービスをより簡単に使用できるようにすることですが、
-            Nirvanix サービス自体についてきちんと理解しておくことも大切です。
-        </para>
-
-        <para>
-            <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html">Nirvanix <acronym>API</acronym> Documentation</ulink>
-            に、このサービスについての概要から詳細な情報までがまとめられています。
-            このドキュメントを熟読し、
-            <classname>Zend_Service_Nirvanix</classname>
-            を使う際にも常に参照するようにしましょう。
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.features">
-        <title>機能</title>
-
-        <para>
-            Nirvanix の REST サービスは、<acronym>PHP</acronym> の
-            <ulink url="http://www.php.net/simplexml">SimpleXML</ulink>
-            拡張モジュールと <classname>Zend_Http_Client</classname>
-            を使うだけでもうまく操作できます。しかしこの方法だと、
-            リクエスト時にセッショントークンを毎回渡したり、
-            レスポンスの内容を確認してエラーコードを調べたりといった繰り返し処理が面倒です。
-        </para>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> には次のような機能があります。
-
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        Nirvanix の認証情報を一元管理し、
-                        Nirvanix 名前空間内で使いまわします。
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        HTTP クライアントをそのまま使うよりもより便利なプロキシオブジェクトを用意し、
-                        REST サービスへのアクセス時に毎回 HTTP POST
-                        リクエストを手で作成させるような手間を省きます。
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        レスポンスオブジェクトのラッパーを用意し、
-                        レスポンスをパースしてエラー時には例外をスローするようにします。
-                        これにより、コマンドが成功したかどうかを調べるような
-                        面倒くさい処理を軽減させることができます。
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        ありがちな操作を行うための、便利なメソッドを提供します。
-                    </para>
-                </listitem>
-            </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.storing-your-first">
-        <title>さぁはじめましょう</title>
-
-        <para>
-            Nirvanix への登録をすませたら、
-            <acronym>IMFS</acronym> 上にファイルを格納する準備は完了です。
-            <acronym>IMFS</acronym> 上で必要となる作業として最もよくあるものは、
-            新規ファイルの作成や既存ファイルのダウンロード、
-            そしてファイルの削除といったところでしょう。
-            <classname>Zend_Service_Nirvanix</classname>
-            には、これら 3 つの操作のための便利なメソッドが用意されています。
-        </para>
-
-        <programlisting language="php"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$imfs->putContents('/foo.txt', 'contents to store');
-
-echo $imfs->getContents('/foo.txt');
-
-$imfs->unlink('/foo.txt');
-]]></programlisting>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname>
-            を利用する際の最初の手続きは常に、サービスに対する認証となります。
-            これは、認証情報を上のように <classname>Zend_Service_Nirvanix</classname>
-            のコンストラクタに渡すことで行います。
-            連想配列の内容が、Nirvanix に対する POST パラメータとして直接渡されます。
-        </para>
-
-        <para>
-            Nirvanix は、ウェブサービスを
-            <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999879">名前空間</ulink>
-            で区別しています。個々の名前空間が、関連する操作群をカプセル化しています。
-            <classname>Zend_Service_Nirvanix</classname> のインスタンスを取得したら、
-            <methodname>getService()</methodname> メソッドをコールして
-            使いたい名前空間へのプロキシを作成します。
-            上の例では、<code>IMFS</code> 名前空間へのプロキシを作成しています。
-        </para>
-
-        <para>
-            使いたい名前空間へのプロキシを取得したら、そのメソッドをコールします。
-            プロキシ上では、REST <acronym>API</acronym> の任意のコマンドを使用できます。
-            また、プロキシにはウェブサービスのコマンドをラップする便利なメソッドも用意されています。
-            上の例では、<acronym>IMFS</acronym> の便利なメソッドを使用して新規ファイルを作成し、
-            それを取得して表示し、最後にファイルを削除しています。
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.understanding-proxy">
-        <title>プロキシについて</title>
-
-        <para>
-            先ほどの理恵では、<methodname>getService()</methodname> メソッドを使用して
-            <code>IMFS</code> 名前空間へのプロキシオブジェクトを取得しました。
-            このプロキシオブジェクトを使用すると、Nirvanix の REST
-            サービスを通常の <acronym>PHP</acronym> のメソッドコールと同じ方式で行うことができます。
-            自分で HTTP リクエストオブジェクトを作成する方式ではこのようにはいきません。
-        </para>
-
-        <para>
-            プロキシオブジェクトには、その他の便利なメソッドも用意されています。
-            <classname>Zend_Service_Nirvanix</classname> が用意するこれらのメソッドを使用すれば、
-            Nirvanix ウェブサービスをよりシンプルに使用できます。
-            先ほどの例では
-            <methodname>putContents()</methodname> や <methodname>getContents()</methodname>、
-            そして <methodname>unlink()</methodname> といったメソッドを使用していますが、
-            REST <acronym>API</acronym> にはこれらに直接対応するものは存在しません。
-            これらのメソッドは <classname>Zend_Service_Nirvanix</classname>
-            が提供しているもので、REST <acronym>API</acronym> 上でのより複雑な操作を抽象化したものです。
-        </para>
-
-        <para>
-            プロキシオブジェクトに対するその他のすべてのメソッドコールは、
-            プロキシによって動的に変換され、同等の REST <acronym>API</acronym>
-            に対する HTTP POST リクエストとなります。
-            これは、メソッド名を <acronym>API</acronym> のコマンドとして使用し、
-            最初の引数に渡した連想配列を POST パラメータとして使用します。
-        </para>
-
-        <para>
-            たとえば、REST <acronym>API</acronym> のメソッド
-            <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999923">RenameFile</ulink>
-            をコールすることを考えてみましょう。このメソッドに対応する便利なメソッドは
-            <classname>Zend_Service_Nirvanix</classname> には用意されていません。
-        </para>
-
-        <programlisting language="php"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$result = $imfs->renameFile(array('filePath' => '/path/to/foo.txt',
-                                  'newFileName' => 'bar.txt'));
-]]></programlisting>
-
-        <para>
-            上の例では、<code>IMFS</code> 名前空間へのプロキシを作成します。
-            そして、プロキシ上で <methodname>renameFile()</methodname> メソッドをコールします。
-            このメソッドは <acronym>PHP</acronym> のコード上では定義されていないので、
-            <methodname>__call()</methodname> に渡されます。
-            そして、REST <acronym>API</acronym> に対する POST リクエストに変換され、
-            連想配列を POST パラメータとして使用します。
-        </para>
-
-        <para>
-            Nirvanix の <acronym>API</acronym> ドキュメントには、このメソッドには <code>sessionToken</code>
-            が必須であるとかかれていますが、プロキシオブジェクトにこれを渡していません。
-            これは、利便性を考慮して自動的に付加されるようになっています。
-        </para>
-
-        <para>
-            この操作の結果は <classname>Zend_Service_Nirvanix_Response</classname>
-            オブジェクトで返されます。これは Nirvanix が返す XML
-            をラップしたものです。エラーが発生した場合は
-            <classname>Zend_Service_Nirvanix_Exception</classname>
-            を返します。
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.examining-results">
-        <title>結果の吟味</title>
-
-        <para>
-            Nirvanix の REST <acronym>API</acronym> は、常に結果を XML で返します。
-            <classname>Zend_Service_Nirvanix</classname> は、この XML を
-            <code>SimpleXML</code> 拡張モジュールでパースして、
-            結果として得られた <code>SimpleXMLElement</code>
-            を <classname>Zend_Service_Nirvanix_Response</classname>
-            オブジェクトに変換します。
-        </para>
-
-        <para>
-            サービスから返された結果の内容を調べるいちばん簡単な方法は、
-            <acronym>PHP</acronym> の組み込み関数である <methodname>print_r()</methodname>
-            などを使用することです。
-        </para>
-
-        <programlisting language="php"><![CDATA[
-<?php
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$result = $imfs->putContents('/foo.txt', 'fourteen bytes');
-print_r($result);
-?>
-
-Zend_Service_Nirvanix_Response Object
-(
-    [_sxml:protected] => SimpleXMLElement Object
-        (
-            [ResponseCode] => 0
-            [FilesUploaded] => 1
-            [BytesUploaded] => 14
-        )
-)
-]]></programlisting>
-
-        <para>
-            <code>SimpleXMLElement</code> の任意のプロパティやメソッドにアクセスできます。
-            上の例では、<code>$result->BytesUploaded</code> を使用して
-            取得したバイト数を調べています。<code>SimpleXMLElement</code>
-            に直接アクセスしたい場合は <code>$result->getSxml()</code> を使用します。
-        </para>
-
-        <para>
-            Nirvanix からの帰り値のほとんどは、成功を表すもの (<code>ResponseCode</code> がゼロ)
-            です。通常は <code>ResponseCode</code> をチェックする必要はありません。
-            というのも、結果がゼロ以外になる場合は
-            <classname>Zend_Service_Nirvanix_Exception</classname> がスローされるからです。
-            エラー処理については次のセクションを参照ください。
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.handling-errors">
-        <title>エラー処理</title>
-
-        <para>
-            Nirvanix を使用する際には、
-            サービスからエラーが返されることも想定して
-            適切にエラー処理を行うようにすることが大切です。
-        </para>
-
-        <para>
-            REST サービスに対するすべて操作の結果は XML で返され、
-            その中には <code>ResponseCode</code> 要素が含まれています。
-            たとえば次のようになります。
-        </para>
-
-        <programlisting language="xml"><![CDATA[
-<Response>
-   <ResponseCode>0</ResponseCode>
-</Response>
-]]></programlisting>
-
-        <para>
-            上の例のように <code>ResponseCode</code> がゼロの場合は、
-            その操作が成功したことを表します。操作が成功しなかった場合は
-            <code>ResponseCode</code> がゼロ以外の値となり、さらに
-            <code>ErrorMessage</code> 要素が含まれるようになります。
-        </para>
-
-        <para>
-            <code>ResponseCode</code> がゼロでないかどうかを
-            毎回チェックするのは手間がかかるので、
-            <classname>Zend_Service_Nirvanix</classname> は自動的に
-            Nirvanix が返す各レスポンスの内容をチェックします。
-            <code>ResponseCode</code> がエラーを表す値であった場合は
-            <classname>Zend_Service_Nirvanix_Exception</classname> がスローされます。
-        </para>
-
-        <programlisting language="xml"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-$nirvanix = new Zend_Service_Nirvanix($auth);
-
-try {
-
-  $imfs = $nirvanix->getService('IMFS');
-  $imfs->unlink('/a-nonexistant-path');
-
-} catch (Zend_Service_Nirvanix_Exception $e) {
-  echo $e->getMessage() . "\n";
-  echo $e->getCode();
-}
-]]></programlisting>
-
-        <para>
-            上の例で使用している <methodname>unlink()</methodname> は、REST <acronym>API</acronym> の
-            <code>DeleteFiles</code> コマンドをラップした便利なメソッドです。
-            <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999918">DeleteFiles</ulink>
-            コマンドが要求する<code>filePath</code> パラメータに、
-            存在しないパスを指定しています。その結果、
-            <classname>Zend_Service_Nirvanix</classname> からは例外がスローされます。
-            メッセージは "Invalid path"、そしてコードは 70005 となります。
-        </para>
-
-        <para>
-            <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html">Nirvanix
-            <acronym>API</acronym> ドキュメント</ulink> に、各コマンドに関連するエラーが説明されています。
-            必要に応じて、各コマンドを <code>try</code> ブロックでラップするようにしましょう。
-            あるいは複数のコマンドをひとつの <code>try</code> ブロックにまとめてもかまいません。
-        </para>
-    </sect2>
-
-</sect1>

+ 0 - 18
documentation/manual/pl/ref/requirements.xml

@@ -1047,12 +1047,6 @@
                         <entry><ulink url="http://www.php.net/manual/en/ref.libxml.php"><code>libxml</code></ulink></entry>
                     </row>
                     <row>
-                        <entry><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.nirvanix.html"><code>Zend_Service_Nirvanix</code></ulink></emphasis></entry>
-                        <entry>---</entry>
-                        <entry>---</entry>
-                        <entry>---</entry>
-                    </row>
-                    <row>
                         <entry><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html"><code>Zend_Service_SlideShare</code></ulink></emphasis></entry>
                         <entry>---</entry>
                         <entry>---</entry>
@@ -1601,17 +1595,6 @@
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.validate.html"><code>Zend_Validate</code></ulink></entry>
                     </row>
                     <row>
-                        <entry morerows="2" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.nirvanix.html"><code>Zend_Service_Nirvanix</code></ulink></emphasis></entry>
-                        <entry morerows="2" valign="middle">Silna</entry>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.exception.html"><code>Zend_Exception</code></ulink></entry>
-                    </row>
-                    <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.http.html"><code>Zend_Http</code></ulink></entry>
-                    </row>
-                    <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.loader.html"><code>Zend_Loader</code></ulink></entry>
-                    </row>
-                    <row>
                         <entry morerows="2" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html"><code>Zend_Service_SlideShare</code></ulink></emphasis></entry>
                         <entry morerows="2" valign="middle">Silna</entry>
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.cache.html"><code>Zend_Cache</code></ulink></entry>
@@ -1819,7 +1802,6 @@ Service_Amazon
 Service_Audioscrobbler
 Service_Delicious
 Service_Flickr
-Service_Nirvanix
 Service_SlideShare
 Service_StrikeIron
 Service_Technorati

+ 0 - 6
documentation/manual/pt-br/module_specs/Zend_Service.xml

@@ -67,12 +67,6 @@
 
         <listitem>
             <para>
-                <link linkend="zend.service.nirvanix">Nirvanix</link>
-            </para>
-        </listitem>
-
-        <listitem>
-            <para>
                 <link linkend="zend.service.recaptcha">ReCaptcha</link>
             </para>
         </listitem>

+ 0 - 399
library/Zend/Cloud/StorageService/Adapter/Nirvanix.php

@@ -1,399 +0,0 @@
-<?php
-/**
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cloud
- * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-require_once 'Zend/Cloud/StorageService/Adapter.php';
-require_once 'Zend/Cloud/StorageService/Exception.php';
-require_once 'Zend/Service/Nirvanix.php';
-
-/**
- * Adapter for Nirvanix cloud storage
- *
- * @category   Zend
- * @package    Zend_Cloud
- * @subpackage StorageService
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cloud_StorageService_Adapter_Nirvanix
-    implements Zend_Cloud_StorageService_Adapter
-{
-    const USERNAME         = 'auth_username';
-    const PASSWORD         = 'auth_password';
-    const APP_KEY          = 'auth_accesskey';
-    const REMOTE_DIRECTORY = 'remote_directory';
-
-    /**
-     * The Nirvanix adapter
-     * @var Zend_Service_Nirvanix
-     */
-    protected $_nirvanix;
-    protected $_imfNs;
-    protected $_metadataNs;
-    protected $_remoteDirectory;
-    private $maxPageSize = 500;
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (!is_array($options)) {
-            throw new Zend_Cloud_StorageService_Exception('Invalid options provided');
-        }
-
-        $auth = array(
-            'username' => $options[self::USERNAME],
-            'password' => $options[self::PASSWORD],
-            'appKey'   => $options[self::APP_KEY],
-        );
-        $nirvanix_options = array();
-        if (isset($options[self::HTTP_ADAPTER])) {
-            $httpc = new Zend_Http_Client();
-            $httpc->setAdapter($options[self::HTTP_ADAPTER]);
-            $nirvanix_options['httpClient'] = $httpc;
-        }
-        try {
-            $this->_nirvanix = new Zend_Service_Nirvanix($auth, $nirvanix_options);
-            $this->_remoteDirectory = $options[self::REMOTE_DIRECTORY];
-            $this->_imfNs = $this->_nirvanix->getService('IMFS');
-            $this->_metadataNs = $this->_nirvanix->getService('Metadata');
-        } catch (Zend_Service_Nirvanix_Exception  $e) {
-            throw new Zend_Cloud_StorageService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-     /**
-     * Get an item from the storage service.
-     *
-     * @param  string $path
-     * @param  array $options
-     * @return mixed
-     */
-    public function fetchItem($path, $options = null)
-    {
-        $path = $this->_getFullPath($path);
-        try {
-            $item = $this->_imfNs->getContents($path);
-        } catch (Zend_Service_Nirvanix_Exception $e) {
-            throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e);
-        }
-        return $item;
-    }
-
-    /**
-     * Store an item in the storage service.
-     * WARNING: This operation overwrites any item that is located at
-     * $destinationPath.
-     * @param string $destinationPath
-     * @param mixed $data
-     * @param  array $options
-     * @return void
-     */
-    public function storeItem($destinationPath, $data, $options = null)
-    {
-        try {
-            $path = $this->_getFullPath($destinationPath);
-            $this->_imfNs->putContents($path, $data);
-        } catch (Zend_Service_Nirvanix_Exception $e) {
-            throw new Zend_Cloud_StorageService_Exception('Error on store: '.$e->getMessage(), $e->getCode(), $e);
-        }
-        return true;
-    }
-
-    /**
-     * Delete an item in the storage service.
-     *
-     * @param  string $path
-     * @param  array $options
-     * @return void
-     */
-    public function deleteItem($path, $options = null)
-    {
-        try {
-            $path = $this->_getFullPath($path);
-            $this->_imfNs->unlink($path);
-        } catch(Zend_Service_Nirvanix_Exception $e) {
-//            if (trim(strtoupper($e->getMessage())) != 'INVALID PATH') {
-//                // TODO Differentiate among errors in the Nirvanix adapter
-            throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Copy an item in the storage service to a given path.
-     * WARNING: This operation is *very* expensive for services that do not
-     * support copying an item natively.
-     *
-     * @param  string $sourcePath
-     * @param  string $destination path
-     * @param  array $options
-     * @return void
-     */
-    public function copyItem($sourcePath, $destinationPath, $options = null)
-    {
-        try {
-            $sourcePath = $this->_getFullPath($sourcePath);
-            $destinationPath = $this->_getFullPath($destinationPath);
-            $this->_imfNs->CopyFiles(array('srcFilePath' => $sourcePath,
-                                            'destFolderPath' => $destinationPath));
-        } catch (Zend_Service_Nirvanix_Exception $e) {
-            throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Move an item in the storage service to a given path.
-     * WARNING: This operation is *very* expensive for services that do not
-     * support moving an item natively.
-     *
-     * @param  string $sourcePath
-     * @param  string $destination path
-     * @param  array $options
-     * @return void
-     */
-    public function moveItem($sourcePath, $destinationPath, $options = null)
-    {
-        try {
-            $sourcePath = $this->_getFullPath($sourcePath);
-            $destinationPath = $this->_getFullPath($destinationPath);
-            $this->_imfNs->RenameFile(array('filePath' => $sourcePath,
-                                             'newFileName' => $destinationPath));
-    //        $this->_imfNs->MoveFiles(array('srcFilePath' => $sourcePath,
-    //                                         'destFolderPath' => $destinationPath));
-        } catch (Zend_Service_Nirvanix_Exception $e) {
-            throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Rename an item in the storage service to a given name.
-     *
-     *
-     * @param  string $path
-     * @param  string $name
-     * @param  array $options
-     * @return void
-     */
-    public function renameItem($path, $name, $options = null)
-    {
-        require_once 'Zend/Cloud/OperationNotAvailableException.php';
-        throw new Zend_Cloud_OperationNotAvailableException('Renaming not implemented');
-    }
-
-    /**
-     * Get a key/value array of metadata for the given path.
-     *
-     * @param  string $path
-     * @param  array $options
-     * @return array An associative array of key/value pairs specifying the metadata for this object.
-     *                  If no metadata exists, an empty array is returned.
-     */
-    public function fetchMetadata($path, $options = null)
-    {
-        $path = $this->_getFullPath($path);
-        try {
-            $metadataNode = $this->_metadataNs->getMetadata(array('path' => $path));
-        } catch (Zend_Service_Nirvanix_Exception $e) {
-            throw new Zend_Cloud_StorageService_Exception('Error on fetching metadata: '.$e->getMessage(), $e->getCode(), $e);
-        }
-
-        $metadata = array();
-        $length = count($metadataNode->Metadata);
-
-        // Need to special case this as Nirvanix returns an array if there is
-        // more than one, but doesn't return an array if there is only one.
-        if ($length == 1)
-        {
-            $metadata[(string)$metadataNode->Metadata->Type->value] = (string)$metadataNode->Metadata->Value;
-        }
-        else if ($length > 1)
-        {
-            for ($i=0; $i<$length; $i++)
-            {
-                $metadata[(string)$metadataNode->Metadata[$i]->Type] = (string)$metadataNode->Metadata[$i]->Value;
-            }
-        }
-        return $metadata;
-    }
-
-    /**
-     * Store a key/value array of metadata at the given path.
-     * WARNING: This operation overwrites any metadata that is located at
-     * $destinationPath.
-     *
-     * @param string $destinationPath
-     * @param array  $metadata        associative array specifying the key/value pairs for the metadata.
-     * @param array  $options
-     * @return void
-     */
-    public function storeMetadata($destinationPath, $metadata, $options = null)
-    {
-        $destinationPath = $this->_getFullPath($destinationPath);
-        if ($metadata != null) {
-            try {
-                foreach ($metadata AS $key=>$value) {
-                    $metadataString = $key . ":" . $value;
-                    $this->_metadataNs->SetMetadata(array(
-                        'path'     => $destinationPath,
-                        'metadata' => $metadataString,
-                    ));
-                }
-            } catch (Zend_Service_Nirvanix_Exception $e) {
-                throw new Zend_Cloud_StorageService_Exception('Error on storing metadata: '.$e->getMessage(), $e->getCode(), $e);
-            }
-        }
-     }
-
-    /**
-     * Delete a key/value array of metadata at the given path.
-     *
-     * @param string $path
-     * @param array $metadata - An associative array specifying the key/value pairs for the metadata
-     *                          to be deleted.  If null, all metadata associated with the object will
-     *                          be deleted.
-     * @param  array $options
-     * @return void
-     */
-    public function deleteMetadata($path, $metadata = null, $options = null)
-    {
-        $path = $this->_getFullPath($path);
-        try {
-            if ($metadata == null) {
-                $this->_metadataNs->DeleteAllMetadata(array('path' => $path));
-            } else {
-                foreach ($metadata AS $key=>$value) {
-                    $this->_metadataNs->DeleteMetadata(array(
-                        'path'     => $path,
-                        'metadata' => $key,
-                    ));
-                    }
-            }
-        } catch (Zend_Service_Nirvanix_Exception $e) {
-            throw new Zend_Cloud_StorageService_Exception('Error on deleting metadata: '.$e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /*
-     * Recursively traverse all the folders and build an array that contains
-     * the path names for each folder.
-     *
-     * @param string $path        folder path to get the list of folders from.
-     * @param array& $resultArray reference to the array that contains the path names
-     *                             for each folder.
-     */
-    private function getAllFolders($path, &$resultArray)
-    {
-        $response = $this->_imfNs->ListFolder(array(
-            'folderPath' => $path,
-               'pageNumber' => 1,
-            'pageSize'   => $this->maxPageSize,
-        ));
-           $numFolders = $response->ListFolder->TotalFolderCount;
-           if ($numFolders == 0) {
-               return;
-           } else {
-               //Need to special case this as Nirvanix returns an array if there is
-               //more than one, but doesn't return an array if there is only one.
-            if ($numFolders == 1) {
-                $folderPath = $response->ListFolder->Folder->Path;
-                array_push($resultArray, $folderPath);
-                $this->getAllFolders('/' . $folderPath, $resultArray);
-            } else {
-                foreach ($response->ListFolder->Folder as $arrayElem) {
-                    $folderPath = $arrayElem->Path;
-                    array_push($resultArray, $folderPath);
-                    $this->getAllFolders('/' . $folderPath, $resultArray);
-                }
-            }
-           }
-    }
-
-    /**
-     * Return an array of the items contained in the given path.  The items
-     * returned are the files or objects that in the specified path.
-     *
-     * @param  string $path
-     * @param  array  $options
-     * @return array
-     */
-    public function listItems($path, $options = null)
-    {
-        $path = $this->_getFullPath($path);
-        $resultArray = array();
-
-        if (!isset($path)) {
-            return false;
-        } else {
-            try {
-                $response = $this->_imfNs->ListFolder(array(
-                    'folderPath' => $path,
-                    'pageNumber' => 1,
-                    'pageSize'   => $this->maxPageSize,
-                ));
-            } catch (Zend_Service_Nirvanix_Exception $e) {
-                throw new Zend_Cloud_StorageService_Exception('Error on list: '.$e->getMessage(), $e->getCode(), $e);
-            }
-
-            $numFiles = $response->ListFolder->TotalFileCount;
-
-            //Add the file names to the array
-            if ($numFiles != 0) {
-                //Need to special case this as Nirvanix returns an array if there is
-                //more than one, but doesn't return an array if there is only one.
-                if ($numFiles == 1) {
-                    $resultArray[] = (string)$response->ListFolder->File->Name;
-                }
-                else {
-                    foreach ($response->ListFolder->File as $arrayElem) {
-                        $resultArray[] = (string) $arrayElem->Name;
-                    }
-                }
-            }
-        }
-
-        return $resultArray;
-    }
-
-    /**
-     * Get full path to an object
-     *
-     * @param  string $path
-     * @return string
-     */
-    private function _getFullPath($path)
-    {
-        return $this->_remoteDirectory . $path;
-    }
-
-    /**
-     * Get the concrete client.
-     * @return Zend_Service_Nirvanix
-     */
-    public function getClient()
-    {
-         return $this->_nirvanix;
-    }
-}

+ 0 - 107
library/Zend/Service/Nirvanix.php

@@ -1,107 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * This class allows Nirvanix authentication credentials to be specified
- * in one place and provides a factory for returning convenience wrappers
- * around the Nirvanix web service namespaces.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix
-{
-    /**
-     * Options to pass to namespace proxies
-     * @param array
-     */
-    protected $_options;
-
-    /**
-     * Class constructor.  Authenticates with Nirvanix to receive a
-     * sessionToken, which is then passed to each future request.
-     *
-     * @param  array  $authParams  Authentication POST parameters.  This
-     *                             should have keys "username", "password",
-     *                             and "appKey".
-     * @param  array  $options     Options to pass to namespace proxies
-     */
-    public function __construct($authParams, $options = array())
-    {
-        // merge options with default options
-        $defaultOptions = array('defaults'   => array(),
-                                'httpClient' => new Zend_Http_Client(),
-                                'host'       => 'http://services.nirvanix.com');
-        $this->_options = array_merge($defaultOptions, $options);
-
-        // login and save sessionToken to default POST params
-        $resp = $this->getService('Authentication')->login($authParams);
-        $this->_options['defaults']['sessionToken'] = (string)$resp->SessionToken;
-    }
-
-    /**
-     * Nirvanix divides its service into namespaces, with each namespace
-     * providing different functionality.  This is a factory method that
-     * returns a preconfigured Zend_Service_Nirvanix_Namespace_Base proxy.
-     *
-     * @param  string  $namespace  Name of the namespace
-     * @return Zend_Service_Nirvanix_Namespace_Base
-     */
-    public function getService($namespace, $options = array())
-    {
-        switch ($namespace) {
-            case 'IMFS':
-                $class = 'Zend_Service_Nirvanix_Namespace_Imfs';
-                break;
-            default:
-                $class = 'Zend_Service_Nirvanix_Namespace_Base';
-        }
-
-        $options['namespace'] = ucfirst($namespace);
-        $options = array_merge($this->_options, $options);
-
-        if (!class_exists($class)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($class);
-        }
-        return new $class($options);
-    }
-
-    /**
-     * Get the configured options.
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-}

+ 0 - 36
library/Zend/Service/Nirvanix/Exception.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Exception extends Zend_Service_Exception
-{}

+ 0 - 172
library/Zend/Service/Nirvanix/Namespace/Base.php

@@ -1,172 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Service_Nirvanix_Response
- */
-require_once 'Zend/Service/Nirvanix/Response.php';
-
-/**
- * The Nirvanix web services are split into namespaces.  This is a proxy class
- * representing one namespace.  It allows calls to the namespace to be made by
- * PHP object calls rather than by having to construct HTTP client requests.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Namespace_Base
-{
-    /**
-     * HTTP client instance that will be used to make calls to
-     * the Nirvanix web services.
-     * @var Zend_Http_Client
-     */
-    protected $_httpClient;
-
-    /**
-     * Host to use for calls to this Nirvanix namespace.  It is possible
-     * that the user will wish to use different hosts for different namespaces.
-     * @var string
-     */
-    protected $_host = 'http://services.nirvanix.com';
-
-    /**
-     * Name of this namespace as used in the URL.
-     * @var string
-     */
-    protected $_namespace = '';
-
-    /**
-     * Defaults for POST parameters.  When a request to the service is to be
-     * made, the POST parameters are merged into these.  This is a convenience
-     * feature so parameters that are repeatedly required like sessionToken
-     * do not need to be supplied again and again by the user.
-     *
-     * @param array
-     */
-    protected $_defaults = array();
-
-    /**
-     * Class constructor.
-     *
-     * @param array $options Options and dependency injection
-     */
-    public function __construct($options = array())
-    {
-        if (isset($options['baseUrl'])) {
-            $this->_host = $options['baseUrl'];
-        }
-
-        if (isset($options['namespace'])) {
-            $this->_namespace = $options['namespace'];
-        }
-
-        if (isset($options['defaults'])) {
-            $this->_defaults = $options['defaults'];
-        }
-
-        if (! isset($options['httpClient'])) {
-            $options['httpClient'] = new Zend_Http_Client();
-        }
-        $this->_httpClient = $options['httpClient'];
-    }
-
-    /**
-     * When a method call is made against this proxy, convert it to
-     * an HTTP request to make against the Nirvanix REST service.
-     *
-     * $imfs->DeleteFiles(array('filePath' => 'foo'));
-     *
-     * Assuming this object was proxying the IMFS namespace, the
-     * method call above would call the DeleteFiles command.  The
-     * POST parameters would be filePath, merged with the
-     * $this->_defaults (containing the sessionToken).
-     *
-     * @param  string  $methodName  Name of the command to call
-     *                              on this namespace.
-     * @param  array   $args        Only the first is used and it must be
-     *                              an array.  It contains the POST params.
-     *
-     * @return Zend_Service_Nirvanix_Response
-     */
-    public function __call($methodName, $args)
-    {
-        $uri = $this->_makeUri($methodName);
-        $this->_httpClient->setUri($uri);
-
-        if (!isset($args[0]) || !is_array($args[0])) {
-            $args[0] = array();
-        }
-
-        $params = array_merge($this->_defaults, $args[0]);
-        $this->_httpClient->resetParameters();
-        $this->_httpClient->setParameterPost($params);
-
-        $httpResponse = $this->_httpClient->request(Zend_Http_Client::POST);
-        return $this->_wrapResponse($httpResponse);
-    }
-
-    /**
-     * Return the HTTP client used for this namespace.  This is useful
-     * for inspecting the last request or directly interacting with the
-     * HTTP client.
-     *
-     * @return Zend_Http_Client
-     */
-    public function getHttpClient()
-    {
-        return $this->_httpClient;
-    }
-
-    /**
-     * Make a complete URI from an RPC method name.  All Nirvanix REST
-     * service URIs use the same format.
-     *
-     * @param  string  $methodName  RPC method name
-     * @return string
-     */
-    protected function _makeUri($methodName)
-    {
-        $methodName = ucfirst($methodName);
-        return "{$this->_host}/ws/{$this->_namespace}/{$methodName}.ashx";
-    }
-
-    /**
-     * All Nirvanix REST service calls return an XML payload.  This method
-     * makes a Zend_Service_Nirvanix_Response from that XML payload.
-     *
-     * @param  Zend_Http_Response  $httpResponse  Raw response from Nirvanix
-     * @return Zend_Service_Nirvanix_Response     Wrapped response
-     */
-    protected function _wrapResponse($httpResponse)
-    {
-        return new Zend_Service_Nirvanix_Response($httpResponse->getBody());
-    }
-}

+ 0 - 105
library/Zend/Service/Nirvanix/Namespace/Imfs.php

@@ -1,105 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_Nirvanix_Namespace_Base
- */
-require_once 'Zend/Service/Nirvanix/Namespace/Base.php';
-
-/**
- * Namespace proxy with additional convenience methods for the IMFS namespace.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Namespace_Imfs extends Zend_Service_Nirvanix_Namespace_Base
-{
-    /**
-     * Convenience function to get the contents of a file on
-     * the Nirvanix IMFS.  Analog to PHP's file_get_contents().
-     *
-     * @param  string  $filePath    Remote path and filename
-     * @param  integer $expiration  Number of seconds that Nirvanix
-     *                              make the file available for download.
-     * @return string               Contents of file
-     */
-    public function getContents($filePath, $expiration = 3600)
-    {
-        // get url to download the file
-        $params = array('filePath'   => $filePath,
-                        'expiration' => $expiration);
-        $resp = $this->getOptimalUrls($params);
-        $url = (string)$resp->Download->DownloadURL;
-
-        // download the file
-        $this->_httpClient->resetParameters();
-        $this->_httpClient->setUri($url);
-        $resp = $this->_httpClient->request(Zend_Http_Client::GET);
-
-        return $resp->getBody();
-    }
-
-    /**
-     * Convenience function to put the contents of a string into
-     * the Nirvanix IMFS.  Analog to PHP's file_put_contents().
-     *
-     * @param  string  $filePath    Remote path and filename
-     * @param  integer $data        Data to store in the file
-     * @param  string  $mimeType    Mime type of data
-     * @return Zend_Service_Nirvanix_Response
-     */
-    public function putContents($filePath, $data, $mimeType = null)
-    {
-        // get storage node for upload
-        $params = array('sizeBytes' => strlen($data));
-        $resp = $this->getStorageNode($params);
-        $host        = (string)$resp->GetStorageNode->UploadHost;
-        $uploadToken = (string)$resp->GetStorageNode->UploadToken;
-
-        // http upload data into remote file
-        $this->_httpClient->resetParameters();
-        $this->_httpClient->setUri("http://{$host}/Upload.ashx");
-        $this->_httpClient->setParameterPost('uploadToken', $uploadToken);
-        $this->_httpClient->setParameterPost('destFolderPath', str_replace('\\', '/',dirname($filePath)));
-        $this->_httpClient->setFileUpload(basename($filePath), 'uploadFile', $data, $mimeType);
-        $response = $this->_httpClient->request(Zend_Http_Client::POST);
-
-        return new Zend_Service_Nirvanix_Response($response->getBody());
-    }
-
-    /**
-     * Convenience function to remove a file from the Nirvanix IMFS.
-     * Analog to PHP's unlink().
-     *
-     * @param  string  $filePath  Remove path and filename
-     * @return Zend_Service_Nirvanix_Response
-     */
-    public function unlink($filePath)
-    {
-        $params = array('filePath' => $filePath);
-        return $this->deleteFiles($params);
-    }
-
-}

+ 0 - 123
library/Zend/Service/Nirvanix/Response.php

@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * This class decorates a SimpleXMLElement parsed from a Nirvanix web service
- * response.  It is primarily exists to provide a convenience feature that
- * throws an exception when <ResponseCode> contains an error.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Response
-{
-    /**
-     * SimpleXMLElement parsed from Nirvanix web service response.
-     *
-     * @var SimpleXMLElement
-     */
-    protected $_sxml;
-
-    /**
-     * Class constructor.  Parse the XML response from a Nirvanix method
-     * call into a decorated SimpleXMLElement element.
-     *
-     * @param string $xml  XML response string from Nirvanix
-     * @throws Zend_Service_Nirvanix_Exception
-     */
-    public function __construct($xml)
-    {
-        $this->_sxml = @simplexml_load_string($xml);
-
-        if (! $this->_sxml instanceof SimpleXMLElement) {
-            $this->_throwException("XML could not be parsed from response: $xml");
-        }
-
-        $name = $this->_sxml->getName();
-        if ($name != 'Response') {
-            $this->_throwException("Expected XML element Response, got $name");
-        }
-
-        $code = (int)$this->_sxml->ResponseCode;
-        if ($code != 0) {
-            $msg = (string)$this->_sxml->ErrorMessage;
-            $this->_throwException($msg, $code);
-        }
-    }
-
-    /**
-     * Return the SimpleXMLElement representing this response
-     * for direct access.
-     *
-     * @return SimpleXMLElement
-     */
-    public function getSxml()
-    {
-        return $this->_sxml;
-    }
-
-    /**
-     * Delegate undefined properties to the decorated SimpleXMLElement.
-     *
-     * @param  string  $offset  Undefined property name
-     * @return mixed
-     */
-    public function __get($offset)
-    {
-        return $this->_sxml->$offset;
-    }
-
-    /**
-     * Delegate undefined methods to the decorated SimpleXMLElement.
-     *
-     * @param  string  $offset  Underfined method name
-     * @param  array   $args    Method arguments
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->_sxml, $method), $args);
-    }
-
-    /**
-     * Throw an exception.  This method exists to only contain the
-     * lazy-require() of the exception class.
-     *
-     * @param  string   $message  Error message
-     * @param  integer  $code     Error code
-     * @throws Zend_Service_Nirvanix_Exception
-     * @return void
-     */
-    protected function _throwException($message, $code = null)
-    {
-        /**
-         * @see Zend_Service_Nirvanix_Exception
-         */
-        require_once 'Zend/Service/Nirvanix/Exception.php';
-
-        throw new Zend_Service_Nirvanix_Exception($message, $code);
-    }
-
-}

+ 0 - 9
tests/TestConfiguration.php.dist

@@ -87,7 +87,6 @@ defined('TESTS_ZEND_CACHE_LIBMEMCACHED_WEIGHT') || define('TESTS_ZEND_CACHE_LIBM
  * You may need to provide connection details for specific adapters under their 
  * specific configuration settings elsewhere in this file.
  */
-defined('TESTS_ZEND_CLOUD_STORAGE_NIRVANIX_DIRECTORY') || define('TESTS_ZEND_CLOUD_STORAGE_NIRVANIX_DIRECTORY',     'simplecloud');
 defined('TESTS_ZEND_CLOUD_STORAGE_WINDOWSAZURE_CONTAINER') || define('TESTS_ZEND_CLOUD_STORAGE_WINDOWSAZURE_CONTAINER', 'simplecloudcontainer');
 
 
@@ -667,14 +666,6 @@ defined('TESTS_ZEND_SERVICE_RACKSPACE_SERVER_SHARED_IP_GROUP_NAME') || define('T
 defined('TESTS_ZEND_SERVICE_RACKSPACE_TIMEOUT') || define('TESTS_ZEND_SERVICE_RACKSPACE_TIMEOUT', 60);
 
 /**
- * Zend_Service_Nirvanix online tests 
- */
-defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ENABLED') || define('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ENABLED', false);
-defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ACCESSKEY') || define('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ACCESSKEY', false);
-defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_PASSWORD') || define('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_PASSWORD', false);
-defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_USERNAME') || define('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_USERNAME', false);
-
-/**
  * Zend_Service_ReCaptcha tests
  */
 defined('TESTS_ZEND_SERVICE_RECAPTCHA_ENABLED') || define('TESTS_ZEND_SERVICE_RECAPTCHA_ENABLED', false);

+ 0 - 6
tests/Zend/Cloud/StorageService/Adapter/AllTests.php

@@ -35,11 +35,6 @@ require_once 'Zend/Cloud/StorageService/Adapter/WindowsAzureTest.php';
 require_once 'Zend/Cloud/StorageService/Adapter/S3Test.php';
 
 /**
- * @see Zend_Cloud_StorageService_Adapter_NirvanixTest
- */
-require_once 'Zend/Cloud/StorageService/Adapter/NirvanixTest.php';
-
-/**
  * @see Zend_Cloud_StorageService_Adapter_RackspaceTest
  */
 require_once 'Zend/Cloud/StorageService/Adapter/RackspaceTest.php';
@@ -78,7 +73,6 @@ class Zend_Cloud_StorageService_Adapter_AllTests
         $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Cloud');
 
         $suite->addTestSuite('Zend_Cloud_StorageService_Adapter_WindowsAzureTest');
-        $suite->addTestSuite('Zend_Cloud_StorageService_Adapter_NirvanixTest');
         $suite->addTestSuite('Zend_Cloud_StorageService_Adapter_RackspaceTest');
         $suite->addTestSuite('Zend_Cloud_StorageService_Adapter_FileSystemTest');
         $suite->addTestSuite('Zend_Cloud_StorageService_Adapter_S3Test');

+ 0 - 108
tests/Zend/Cloud/StorageService/Adapter/NirvanixTest.php

@@ -1,108 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cloud_StorageService
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-// Call Zend_Cloud_StorageService_Adapter_NirvanixTest::main() if this source file is executed directly.
-if (!defined("PHPUnit_MAIN_METHOD")) {
-    define("PHPUnit_MAIN_METHOD", "Zend_Cloud_StorageService_Adapter_NirvanixTest::main");
-}
-
-/**
- * @see Zend_Cloud_StorageService_TestCase
- */
-require_once 'Zend/Cloud/StorageService/TestCase.php';
-/**
- * @see Zend_Cloud_StorageService_Adapter_Nirvanix
- */
-require_once 'Zend/Cloud/StorageService/Adapter/Nirvanix.php';
-
-/**
- * @category   Zend
- * @package    Zend_Cloud
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cloud_StorageService_Adapter_NirvanixTest extends Zend_Cloud_StorageService_TestCase
-{
-	protected $_clientType = 'Zend_Service_Nirvanix';
-
-	/**
-     * Runs the test methods of this class.
-     *
-     * @access public
-     * @static
-     */
-    public static function main()
-    {
-        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
-    public function testFetchItemStream()
-    {
-        // The Nirvanix client library doesn't support streams
-        $this->markTestSkipped('The Nirvanix client library doesn\'t support streams.');
-    }
-
-    public function testStoreItemStream()
-    {
-        // The Nirvanix client library doesn't support streams
-        $this->markTestSkipped('The Nirvanix client library doesn\'t support streams.');
-    }
-
-    /**
-     * Sets up this test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->_waitPeriod = 5;
-    }
-
-    protected function _getConfig()
-    {
-        if (!defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ENABLED')
-            || !constant('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ENABLED')
-            || !defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_USERNAME')
-            || !defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ACCESSKEY')
-            || !defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_PASSWORD')
-            || !defined('TESTS_ZEND_CLOUD_STORAGE_NIRVANIX_DIRECTORY')
-        ) {
-            $this->markTestSkipped("Windows Azure access not configured, skipping test");
-        }
-
-        $config = new Zend_Config(array(
-            Zend_Cloud_StorageService_Factory::STORAGE_ADAPTER_KEY       => 'Zend_Cloud_StorageService_Adapter_Nirvanix',
-            Zend_Cloud_StorageService_Adapter_Nirvanix::USERNAME         => constant('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_USERNAME'),
-            Zend_Cloud_StorageService_Adapter_Nirvanix::APP_KEY          => constant('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ACCESSKEY'),
-            Zend_Cloud_StorageService_Adapter_Nirvanix::PASSWORD         => constant('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_PASSWORD'),
-            Zend_Cloud_StorageService_Adapter_Nirvanix::REMOTE_DIRECTORY => constant('TESTS_ZEND_CLOUD_STORAGE_NIRVANIX_DIRECTORY'),
-        ));
-
-        return $config;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_StorageService_Adapter_NirvanixTest::main') {
-    Zend_Cloud_StorageService_Adapter_NirvanixTest::main();
-}

+ 1 - 1
tests/Zend/Cloud/StorageService/Adapter/RackspaceTest.php

@@ -19,7 +19,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-// Call Zend_Cloud_StorageService_Adapter_NirvanixTest::main() if this source file is executed directly.
+// Call Zend_Cloud_StorageService_Adapter_RackspaceTest::main() if this source file is executed directly.
 if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_StorageService_Adapter_RackspaceTest::main");
 }

+ 0 - 23
tests/Zend/Cloud/StorageService/FactoryTest.php

@@ -36,8 +36,6 @@ require_once 'Zend/Cloud/StorageService/Factory.php';
 
 require_once 'Zend/Cloud/StorageService/Adapter/FileSystem.php';
 
-require_once 'Zend/Cloud/StorageService/Adapter/Nirvanix.php';
-
 require_once 'Zend/Cloud/StorageService/Adapter/S3.php';
 
 require_once 'Zend/Cloud/StorageService/Adapter/WindowsAzure.php';
@@ -76,27 +74,6 @@ class Zend_Cloud_StorageService_FactoryTest extends PHPUnit_Framework_TestCase
     {
         $httptest = new Zend_Http_Client_Adapter_Test();
 
-        // Nirvanix adapter
-        $nirvanixConfig = new Zend_Config_Ini(realpath(dirname(__FILE__) . '/_files/config/nirvanix.ini'));
-        $nirvanixConfig = $nirvanixConfig->toArray();
-        $nirvanixConfig[Zend_Cloud_StorageService_Adapter_Nirvanix::HTTP_ADAPTER] = $httptest;
-
-        $doc = new DOMDocument('1.0', 'utf-8');
-        $root = $doc->createElement('Response');
-        $responseCode = $doc->createElement('ResponseCode', 0);
-        $sessionTok   = $doc->createElement('SessionToken', '54592180-7060-4D4B-BC74-2566F4B2F943');
-        $root->appendChild($responseCode);
-        $root->appendChild($sessionTok);
-        $doc->appendChild($root);
-        $body = $doc->saveXML();
-
-        $resp = new Zend_Http_Response(200, array('Date' => 0), $body);
-        $httptest->setResponse($resp);
-        $nirvanixAdapter = Zend_Cloud_StorageService_Factory::getAdapter(
-                                    $nirvanixConfig
-        );
-        $this->assertEquals('Zend_Cloud_StorageService_Adapter_Nirvanix', get_class($nirvanixAdapter));
-
         // S3 adapter
         $s3Config = new Zend_Config_Ini(realpath(dirname(__FILE__) . '/_files/config/s3.ini'));
         $s3Adapter = Zend_Cloud_StorageService_Factory::getAdapter($s3Config);

+ 0 - 5
tests/Zend/Cloud/StorageService/_files/config/nirvanix.ini

@@ -1,5 +0,0 @@
-storage_adapter = "Zend_Cloud_StorageService_Adapter_Nirvanix"
-auth_accesskey = test
-auth_username  = test
-auth_password  = test
-remote_directory = "/SimpleCloudUnitTests/"

+ 0 - 2
tests/Zend/Service/AllTests.php

@@ -32,7 +32,6 @@ require_once 'Zend/Service/DeveloperGarden/AllTests.php';
 require_once 'Zend/Service/Ebay/AllTests.php';
 require_once 'Zend/Service/Flickr/AllTests.php';
 require_once 'Zend/Service/LiveDocx/AllTests.php';
-require_once 'Zend/Service/Nirvanix/AllTests.php';
 require_once 'Zend/Service/ReCaptcha/AllTests.php';
 require_once 'Zend/Service/ShortUrl/AllTests.php';
 require_once 'Zend/Service/SlideShareTest.php';
@@ -79,7 +78,6 @@ class Zend_Service_AllTests
         $suite->addTest(Zend_Service_Ebay_AllTests::suite());
         $suite->addTest(Zend_Service_Flickr_AllTests::suite());
         $suite->addTest(Zend_Service_LiveDocx_AllTests::suite());
-        $suite->addTest(Zend_Service_Nirvanix_AllTests::suite());
         $suite->addTest(Zend_Service_ReCaptcha_AllTests::suite());
         $suite->addTest(Zend_Service_ShortUrl_AllTests::suite());
         $suite->addTestSuite('Zend_Service_SlideShareTest');

+ 0 - 65
tests/Zend/Service/Nirvanix/AllTests.php

@@ -1,65 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id $
- */
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_Nirvanix_AllTests::main');
-}
-
-require_once 'Zend/Service/Nirvanix/NirvanixTest.php';
-require_once 'Zend/Service/Nirvanix/ExceptionTest.php';
-require_once 'Zend/Service/Nirvanix/ResponseTest.php';
-require_once 'Zend/Service/Nirvanix/Namespace/BaseTest.php';
-require_once 'Zend/Service/Nirvanix/Namespace/ImfsTest.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Nirvanix
- */
-class Zend_Service_Nirvanix_AllTests
-{
-    public static function main()
-    {
-        PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Service_Nirvanix');
-
-        $suite->addTestSuite('Zend_Service_Nirvanix_NirvanixTest');
-        $suite->addTestSuite('Zend_Service_Nirvanix_ExceptionTest');
-        $suite->addTestSuite('Zend_Service_Nirvanix_ResponseTest');
-        $suite->addTestSuite('Zend_Service_Nirvanix_Namespace_BaseTest');
-        $suite->addTestSuite('Zend_Service_Nirvanix_Namespace_ImfsTest');
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Zend_Service_Nirvanix_AllTests::main') {
-    Zend_Service_Nirvanix_AllTests::main();
-}

+ 0 - 44
tests/Zend/Service/Nirvanix/ExceptionTest.php

@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_Nirvanix_Exception
- */
-require_once 'Zend/Service/Nirvanix/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Nirvanix
- */
-class Zend_Service_Nirvanix_ExceptionTest extends PHPUnit_Framework_TestCase
-{
-    public function testInheritsFromZendException()
-    {
-        $exc = new Zend_Service_Nirvanix_Exception();
-        $this->assertTrue($exc instanceof Zend_Exception);
-    }
-}

+ 0 - 81
tests/Zend/Service/Nirvanix/FunctionalTestCase.php

@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id $
- */
-
-/**
- * @see Zend_Service_Nirvanix
- */
-require_once 'Zend/Service/Nirvanix.php';
-
-/**
- * @see Zend_Http_Client_Adapter_Test
- */
-require_once 'Zend/Http/Client/Adapter/Test.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Nirvanix
- */
-class Zend_Service_Nirvanix_FunctionalTestCase extends PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        $this->httpAdapter = new Zend_Http_Client_Adapter_Test();
-        $this->httpClient = new Zend_Http_Client('http://foo',
-                                    array('adapter' => $this->httpAdapter));
-
-        $this->auth = array('username' => 'foo', 'password' => 'bar', 'appKey' => 'baz');
-        $this->options = array('httpClient' => $this->httpClient);
-
-        // set first nirvanix response to successful login
-        $this->httpAdapter->setResponse(
-            $this->makeNirvanixResponse(array('ResponseCode' => '0',
-                                              'SessionToken' => 'foo'))
-        );
-
-        $this->nirvanix = new Zend_Service_Nirvanix($this->auth, $this->options);
-    }
-
-    public function makeNirvanixResponse($hash)
-    {
-        $xml = "<?xml version='1.0'?><Response>";
-        foreach ($hash as $k => $v) { $xml .= "<$k>$v</$k>"; }
-        $xml .= "</Response>";
-
-        $resp = $this->makeHttpResponseFrom($xml);
-        return $resp;
-    }
-
-    public function makeHttpResponseFrom($data, $status=200, $message='OK')
-    {
-        $headers = array("HTTP/1.1 $status $message",
-                         "Status: $status",
-                         'Content_Type: text/xml; charset=utf-8',
-                         'Content-Length: ' . strlen($data)
-                         );
-        return implode("\r\n", $headers) . "\r\n\r\n$data\r\n\r\n";
-    }
-}

+ 0 - 50
tests/Zend/Service/Nirvanix/Namespace/BaseTest.php

@@ -1,50 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_Nirvanix_Namespace_Base
- */
-require_once 'Zend/Service/Nirvanix/Namespace/Base.php';
-
-/**
- * @see Zend_Service_Nirvanix_FunctionalTestCase
- */
-require_once 'Zend/Service/Nirvanix/FunctionalTestCase.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Nirvanix
- */
-class Zend_Service_Nirvanix_Namespace_BaseTest extends Zend_Service_Nirvanix_FunctionalTestCase
-{
-    public function testGetHttpClient()
-    {
-        $foo = $this->nirvanix->getService('Foo');
-        $this->assertSame($this->httpClient, $foo->getHttpClient());
-    }
-
-}

+ 0 - 121
tests/Zend/Service/Nirvanix/Namespace/ImfsTest.php

@@ -1,121 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_Nirvanix_Namespace_Imfs
- */
-require_once 'Zend/Service/Nirvanix/Namespace/Imfs.php';
-
-/**
- * @see Zend_Service_Nirvanix_FunctionalTestCase
- */
-require_once 'Zend/Service/Nirvanix/FunctionalTestCase.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Nirvanix
- */
-class Zend_Service_Nirvanix_Namespace_ImfsTest extends Zend_Service_Nirvanix_FunctionalTestCase
-{
-    public function testInheritsFromNirvanixBase()
-    {
-        $imfs = new Zend_Service_Nirvanix_Namespace_Imfs();
-        $this->assertTrue($imfs instanceof Zend_Service_Nirvanix_Namespace_Base);
-    }
-
-    // putContents()
-
-    public function testPutContents()
-    {
-        $imfs = $this->nirvanix->getService('IMFS');
-
-        // response for call to GetStorageNode
-        $this->httpAdapter->addResponse(
-           $this->makeNirvanixResponse(
-                array('ResponseCode'   => '0',
-                      'GetStorageNode' => '<UploadHost>node1.nirvanix.com</UploadHost>
-                                           <UploadToken>bar</UploadToken>'))
-        );
-
-        $imfs->putContents('/foo', 'contents for foo');
-    }
-
-    // getContents()
-
-    public function testGetContents()
-    {
-        $imfs = $this->nirvanix->getService('IMFS');
-
-        // response for call to GetOptimalUrlss
-        $this->httpAdapter->addResponse(
-           $this->makeNirvanixResponse(
-                array('ResponseCode' => '0',
-                      'Download' => '<DownloadURL>http://get-it-here</DownloadURL>'))
-        );
-
-        // response for file download
-        $this->httpAdapter->addResponse(
-            $this->makeHttpResponseFrom('contents for foo')
-        );
-
-        $actual = $imfs->getContents('/foo.txt');
-        $expected = $this->httpClient->getLastResponse()->getBody();
-        $this->assertEquals($expected, $actual);
-    }
-
-    // unlink()
-
-    public function testUnlink()
-    {
-        $imfs = $this->nirvanix->getService('IMFS');
-
-        // response for call to DeleteFiles
-        $this->httpAdapter->addResponse(
-            $this->makeNirvanixResponse(array('ResponseCode' => '0'))
-        );
-
-        $imfs->unlink('foo');
-    }
-
-    /**
-     * @group ZF-6860
-     */
-    public function testDestinationPathFormatSentToServiceAsParameterUsesUnixConvention()
-    {
-        $imfs = $this->nirvanix->getService('IMFS');
-        $this->httpAdapter->addResponse(
-           $this->makeNirvanixResponse(
-                array('ResponseCode'   => '0',
-                      'GetStorageNode' => '<UploadHost>node1.nirvanix.com</UploadHost>
-                                           <UploadToken>bar</UploadToken>'))
-        );
-        // little unix cheat to force a backslash into the IFS path
-        $imfs->putContents('.\foo/bar', 'contents for foo');
-        $this->assertContains('./foo', $imfs->getHttpClient()->getLastRequest());
-    }
-
-}

+ 0 - 71
tests/Zend/Service/Nirvanix/NirvanixTest.php

@@ -1,71 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_Nirvanix_FunctionalTestCase
- */
-require_once 'Zend/Service/Nirvanix/FunctionalTestCase.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Nirvanix
- */
-class Zend_Service_Nirvanix_NirvanixTest extends Zend_Service_Nirvanix_FunctionalTestCase
-{
-    // getService()
-
-    public function testFactoryReturnsBaseWhenNoSubclassAvailable()
-    {
-        $base = $this->nirvanix->getService('Foo');
-        $this->assertTrue($base instanceof Zend_Service_Nirvanix_Namespace_Base);
-    }
-
-    public function testFactoryReturnsImfsSubclassForImfsNamespace()
-    {
-        $imfs = $this->nirvanix->getService('IMFS');
-        $this->assertTrue($imfs instanceof Zend_Service_Nirvanix_Namespace_Imfs);
-    }
-
-    public function testFactoryPassesHttpClientInstanceWithOptions()
-    {
-        $nirvanixOptions = $this->nirvanix->getOptions();
-        $this->assertSame($this->httpClient, $nirvanixOptions['httpClient']);
-
-        $foo = $this->nirvanix->getService('Foo');
-        $fooOptions = $foo->getOptions();
-        $this->assertSame($this->httpClient, $nirvanixOptions['httpClient']);
-    }
-
-    // getOptions()
-
-    public function testGetOptionsReturnsOptions()
-    {
-        $options = $this->nirvanix->getOptions();
-        $this->assertSame($this->httpClient, $options['httpClient']);
-    }
-
-}

+ 0 - 117
tests/Zend/Service/Nirvanix/ResponseTest.php

@@ -1,117 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_Nirvanix_Response
- */
-require_once 'Zend/Service/Nirvanix/Response.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Nirvanix
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Nirvanix
- */
-class Zend_Service_Nirvanix_ResponseTest extends PHPUnit_Framework_TestCase
-{
-    // Constructor
-
-    public function testThrowsWhenInputStringIsNotXML()
-    {
-        $notXml = 'foo';
-        try {
-            new Zend_Service_Nirvanix_Response($notXml);
-        } catch (Zend_Service_Nirvanix_Exception $e) {
-            $this->assertRegExp('/xml could not be parsed/i', $e->getMessage());
-        }
-    }
-
-    public function testThrowsWhenXmlElementNameIsNotResponse()
-    {
-        $xml = "<?xml version='1.0'?>
-                  <foo></foo>";
-        try {
-            new Zend_Service_Nirvanix_Response($xml);
-        } catch (Zend_Service_Nirvanix_Exception $e) {
-            $this->assertRegExp('/expected xml element response/i', $e->getMessage());
-        }
-    }
-
-    public function testThrowsCodeAndMessageWhenResponseCodeIsNotZero()
-    {
-        $xml = "<?xml version='1.0'?>
-                  <Response>
-                    <ResponseCode>42</ResponseCode>
-                    <ErrorMessage>foo</ErrorMessage>
-                  </Response>";
-        try {
-            new Zend_Service_Nirvanix_Response($xml);
-        } catch (Zend_Service_Nirvanix_Exception $e) {
-            $this->assertEquals(42, $e->getCode());
-            $this->assertEquals('foo', $e->getMessage());
-        }
-    }
-
-    // getSxml()
-
-    public function testGetSxmlReturnsSimpleXmlElement()
-    {
-        $xml = "<?xml version='1.0'?>
-                  <Response>
-                    <ResponseCode>0</ResponseCode>
-                    <foo>bar</foo>
-                  </Response>";
-
-        $resp = new Zend_Service_Nirvanix_Response($xml);
-        $this->assertTrue($resp->getSxml() instanceof SimpleXMLElement);
-    }
-
-    // __get()
-
-    public function testUndefinedPropertyIsDelegatedToSimpleXMLElement()
-    {
-        $xml = "<?xml version='1.0'?>
-                  <Response>
-                    <ResponseCode>0</ResponseCode>
-                    <foo>bar</foo>
-                  </Response>";
-        $resp = new Zend_Service_Nirvanix_Response($xml);
-        $this->assertEquals('bar', (string)$resp->foo);
-    }
-
-    // __call()
-
-    public function testUndefinedMethodIsDelegatedToSimpleXMLElement()
-    {
-        $xml = "<?xml version='1.0'?>
-                  <Response>
-                    <ResponseCode>0</ResponseCode>
-                    <foo>bar</foo>
-                  </Response>";
-        $resp = new Zend_Service_Nirvanix_Response($xml);
-        $this->assertEquals('Response', $resp->getName());
-    }
-
-}

+ 1 - 1
tests/Zend/Service/Rackspace/AllTests.php

@@ -13,7 +13,7 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service_Nirvanix
+ * @package    Zend_Service_Rackspace
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License

+ 1 - 1
tests/Zend/Service/Rackspace/Files/AllTests.php

@@ -13,7 +13,7 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service_Nirvanix
+ * @package    Zend_Service_Rackspace
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License

+ 1 - 1
tests/Zend/Service/Rackspace/Servers/AllTests.php

@@ -13,7 +13,7 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service_Nirvanix
+ * @package    Zend_Service_Rackspace
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License

+ 1 - 1
tests/runtests.sh

@@ -47,7 +47,7 @@ while [ -n "$1" ] ; do
      PHPUNIT_GROUPS="" 
      break ;;
 
-    Akismet|Amazon|Amazon_Ec2|Amazon_S3|Amazon_Sqs|Audioscrobbler|Delicious|Flickr|LiveDocx|Nirvanix|ReCaptcha|Simpy|SlideShare|StrikeIron|Technorati|Twitter|WindowsAzure|Yahoo)
+    Akismet|Amazon|Amazon_Ec2|Amazon_S3|Amazon_Sqs|Audioscrobbler|Delicious|Flickr|LiveDocx|ReCaptcha|Simpy|SlideShare|StrikeIron|Technorati|Twitter|WindowsAzure|Yahoo)
      PHPUNIT_GROUPS="${PHPUNIT_GROUPS:+"$PHPUNIT_GROUPS,"}Zend_Service_$1" 
      shift ;;
     Ec2|S3)