Merge "Use HTTP response codes for identity v3"

api-ref/src/wadls/identity-api/src/v3/wadl/OS-OAUTH1-v3.wadl

@@ -757,7 +757,7 @@
         <request>
             <representation mediaType="application/json"/>
         </request>
-        <response status="200 203">
+        <response status="200">
             <representation mediaType="application/json"/>
         </response> &commonFaults; &getFaults; </method>
     <method name="GET" id="listAuthorizedAccessTokens">

api-ref/src/wadls/identity-api/src/v3/wadl/common.ent

@@ -4,32 +4,33 @@
          in every request.
      -->
 <!ENTITY commonFaults '
-<response xmlns="http://wadl.dev.java.net/2009/02">
+<response status="400" xmlns="http://wadl.dev.java.net/2009/02"
-    <representation mediaType="application/xml"
+        xmlns:rax="http://docs.rackspace.com/api" rax:phrase="Bad Request">
-        element="identity:identityFault"/>
-    <representation mediaType="application/json"/>
-</response>
-<response status="400" xmlns="http://wadl.dev.java.net/2009/02">
     <representation mediaType="application/xml" element="identity:badRequest"/>
     <representation mediaType="application/json"/>
 </response>
-<response status="401" xmlns="http://wadl.dev.java.net/2009/02">
+<response status="401" xmlns="http://wadl.dev.java.net/2009/02"
+        xmlns:rax="http://docs.rackspace.com/api" rax:phrase="Unauthorized">
     <representation mediaType="application/xml" element="identity:unauthorized"/>
     <representation mediaType="application/json"/>
 </response>
-<response status="403" xmlns="http://wadl.dev.java.net/2009/02">
+<response status="403" xmlns="http://wadl.dev.java.net/2009/02"
+        xmlns:rax="http://docs.rackspace.com/api" rax:phrase="Forbidden">
     <representation mediaType="application/xml" element="identity:forbidden"/>
     <representation mediaType="application/json"/>
 </response>
-<response status="405" xmlns="http://wadl.dev.java.net/2009/02">
+<response status="405" xmlns="http://wadl.dev.java.net/2009/02"
+        xmlns:rax="http://docs.rackspace.com/api" rax:phrase="Method Not Allowed">
     <representation mediaType="application/xml" element="identity:badMethod"/>
     <representation mediaType="application/json"/>
 </response>
-<response status="413" xmlns="http://wadl.dev.java.net/2009/02">
+<response status="413" xmlns="http://wadl.dev.java.net/2009/02"
+        xmlns:rax="http://docs.rackspace.com/api" rax:phrase="Request Entity Too Large">
     <representation mediaType="application/xml" element="identity:overLimit"/>
     <representation mediaType="application/json"/>
 </response>
-<response status="503" xmlns="http://wadl.dev.java.net/2009/02">
+<response status="503" xmlns="http://wadl.dev.java.net/2009/02"
+        xmlns:rax="http://docs.rackspace.com/api" rax:phrase="Service Unavailable">
     <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
     <representation mediaType="application/json"/>
 </response>'>
@@ -37,7 +38,8 @@
           Faults on GET
  -->
 <!ENTITY getFaults '
-<response status="404" xmlns="http://wadl.dev.java.net/2009/02">
+<response status="404" xmlns="http://wadl.dev.java.net/2009/02"
+        xmlns:rax="http://docs.rackspace.com/api" rax:phrase="Not Found">
     <representation mediaType="application/xml"
         element="identity:itemNotFound"/>
     <representation mediaType="application/json"/>
@@ -46,7 +48,8 @@
           Faults on POST/PUT
 -->
 <!ENTITY postPutFaults '
-<response status="415" xmlns="http://wadl.dev.java.net/2009/02">
+<response status="415" xmlns="http://wadl.dev.java.net/2009/02"
+        xmlns:rax="http://docs.rackspace.com/api" rax:phrase="Unsupported Media Type">
     <representation mediaType="application/xml"
         element="identity:badMediaType"/>
     <representation mediaType="application/json"/>

api-ref/src/wadls/identity-api/src/v3/wadl/identity-admin-v3.wadl

@@ -555,15 +555,13 @@
                 indicate the supported authentication methods.
                 </para><para>For authentication processes that require
                 multiple round trips, The Identity API implementation
-                might return an <code>HTTP 401 Not Authorized</code>
+                might return an <code>HTTP 401 Unauthorized</code>
                 error with additional information for the next
                 authentication step.</para>
             <para>The following examples illustrate several possible
                 HTTP 401 Unauthorized authentication errors. Other
                 errors like HTTP <errorcode>403</errorcode>
-                <returnvalue>Forbidden</returnvalue> and HTTP
+                <returnvalue>Forbidden</returnvalue> are also
-                    <errorcode>409</errorcode>
-                <returnvalue>Conflict</returnvalue> are also
                 possible.</para>
         </wadl:doc>
         <request>
@@ -666,7 +664,7 @@
                 </wadl:doc>
             </representation>
         </response>
-        <response status="401">
+        <response status="401" xmlns:rax="http://docs.rackspace.com/api" rax:phrase="Unauthorized">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     title="Error: Basic HTTP 401 Not Authorized: JSON Response">
@@ -693,7 +691,7 @@
                 </wadl:doc>
             </representation>
         </response>
-        <response status="404 409"/> &commonFaults; &getFaults; </method>
+        &commonFaults; &getFaults; </method>
     <method name="GET" id="validateTokens">
         <wadl:doc xmlns="http://docbook.org/ns/docbook"
             xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -718,7 +716,7 @@
                 </wadl:doc>&authTokenHeader; &subjectTokenHeader;
             </representation>
         </request>
-        <response status="200 203">
+        <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">