Merge remote branch 'khussein/master'

15 files changed, 58 insertions, 58 deletions

diff --git a/docs/guide/src/docbkx/samples/extension.json b/docs/guide/src/docbkx/samples/extension.json
index 68233e90..9efaa422 100644
--- a/docs/guide/src/docbkx/samples/extension.json
+++ b/docs/guide/src/docbkx/samples/extension.json
@@ -9,7 +9,7 @@
           {
               "rel" : "describedby",
               "type" : "application/pdf",
-              "href" : "http://docs.rackspacecloud.com/idm/api/ext/identity-meta-20111201.pdf"
+              "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
           },
           {
               "rel" : "describedby",
diff --git a/docs/guide/src/docbkx/samples/extension.xml b/docs/guide/src/docbkx/samples/extension.xml
index d0dbffe9..056d7e96 100644
--- a/docs/guide/src/docbkx/samples/extension.xml
+++ b/docs/guide/src/docbkx/samples/extension.xml
@@ -13,10 +13,10 @@
 
     <atom:link rel="describedby"
                type="application/pdf"
-               href="http://docs.rackspacecloud.com/idm/api/ext/idm-meta-20111201.pdf"/>
+               href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"/>
     <atom:link rel="describedby"
                type="application/vnd.sun.wadl+xml"
-               href="http://docs.rackspacecloud.com/idm/api/ext/idm-meta.wadl"/>
+               href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"/>
 
 </extension>
     
diff --git a/docs/guide/src/docbkx/samples/extensions.json b/docs/guide/src/docbkx/samples/extensions.json
index 8b594526..553c892e 100644
--- a/docs/guide/src/docbkx/samples/extensions.json
+++ b/docs/guide/src/docbkx/samples/extensions.json
@@ -3,7 +3,7 @@
         "values" : [
             {
                 "name" : "Reset Password Extension",
-                "namespace" : "http://docs.rackspacecloud.com/idm/api/ext/rpe/v1.0",
+                "namespace" : "http://docs.rackspacecloud.com/identity/api/ext/rpe/v1.0",
                 "alias" : "RS-RPE",
                 "updated" : "2011-01-22T13:25:27-06:00",
                 "description" : "Adds the capability to reset a user's password. The user is emailed when the password has been reset.",
@@ -11,12 +11,12 @@
                     {
                         "rel" : "describedby",
                         "type" : "application/pdf",
-                        "href" : "http://docs.rackspacecloud.com/idm/api/ext/idm-rpe-20111111.pdf"
+                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf"
                     },
                     {
                         "rel" : "describedby",
                         "type" : "application/vnd.sun.wadl+xml",
-                        "href" : "http://docs.rackspacecloud.com/idm/api/ext/idm-rpe.wadl"
+                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe.wadl"
                     }
                 ]
             },
@@ -30,12 +30,12 @@
                     {
                         "rel" : "describedby",
                         "type" : "application/pdf",
-                        "href" : "http://docs.rackspacecloud.com/idm/api/ext/idm-meta-20111201.pdf"
+                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
                     },
                     {
                         "rel" : "describedby",
                         "type" : "application/vnd.sun.wadl+xml",
-                        "href" : "http://docs.rackspacecloud.com/idm/api/ext/idm-meta.wadl"
+                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"
                     }
                 ]
             }
diff --git a/docs/guide/src/docbkx/samples/extensions.xml b/docs/guide/src/docbkx/samples/extensions.xml
index f0a9a49d..c11b06d7 100644
--- a/docs/guide/src/docbkx/samples/extensions.xml
+++ b/docs/guide/src/docbkx/samples/extensions.xml
@@ -4,7 +4,7 @@
             xmlns:atom="http://www.w3.org/2005/Atom">
     <extension
         name="Reset Password Extension"
-        namespace="http://docs.rackspacecloud.com/idm/api/ext/rpe/v1.0"
+        namespace="http://docs.rackspacecloud.com/identity/api/ext/rpe/v1.0"
         alias="RS-RPE"
         updated="2011-01-22T13:25:27-06:00">
 
@@ -15,10 +15,10 @@
 
         <atom:link rel="describedby"
                    type="application/pdf"
-                   href="http://docs.rackspacecloud.com/idm/api/ext/idm-rpe-20111111.pdf"/>
+                   href="http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf"/>
         <atom:link rel="describedby"
                    type="application/vnd.sun.wadl+xml"
-                   href="http://docs.rackspacecloud.com/idm/api/ext/idm-rpe.wadl"/>
+                   href="http://docs.rackspacecloud.com/identity/api/ext/identity-rpe.wadl"/>
     </extension>
     <extension
         name="User Metadata Extension"
@@ -31,9 +31,9 @@
 
         <atom:link rel="describedby"
                    type="application/pdf"
-                   href="http://docs.rackspacecloud.com/idm/api/ext/idm-meta-20111201.pdf"/>
+                   href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"/>
         <atom:link rel="describedby"
                    type="application/vnd.sun.wadl+xml"
-                   href="http://docs.rackspacecloud.com/idm/api/ext/idm-meta.wadl"/>
+                   href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"/>
     </extension>
 </extensions>
diff --git a/docs/guide/src/docbkx/samples/identity_fault.json b/docs/guide/src/docbkx/samples/identity_fault.json
index 84e3908e..d61feff4 100644
--- a/docs/guide/src/docbkx/samples/identity_fault.json
+++ b/docs/guide/src/docbkx/samples/identity_fault.json
@@ -1,4 +1,4 @@
-{"idmFault":
+{"identityFault":
     {
       "message": "Fault",
       "details": "Error Details...",
diff --git a/docs/guide/src/docbkx/samples/identity_fault.xml b/docs/guide/src/docbkx/samples/identity_fault.xml
index 0592d948..6787af21 100644
--- a/docs/guide/src/docbkx/samples/identity_fault.xml
+++ b/docs/guide/src/docbkx/samples/identity_fault.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<idmFault xmlns="http://docs.openstack.org/identity/api/v2.0"
+<identityFault xmlns="http://docs.openstack.org/identity/api/v2.0"
           code="500">
 	<message>Fault</message>
 	<details>Error Details...</details>
-</idmFault>
+</identityFault>
diff --git a/docs/guide/src/docbkx/samples/samplerequestheader.json b/docs/guide/src/docbkx/samples/samplerequestheader.json
index 7db2a40f..32a3a798 100644
--- a/docs/guide/src/docbkx/samples/samplerequestheader.json
+++ b/docs/guide/src/docbkx/samples/samplerequestheader.json
@@ -1,4 +1,4 @@
-POST /v1.0/token HTTP/1.1
+POST /v2.0/token HTTP/1.1
 Host: identity.api.rackspace.com
 Content-Type: application/json
 Accept: application/xml
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/version-atom.xml b/docs/guide/src/docbkx/samples/version-atom.xml
index 13ac3b0b..519ab203 100644
--- a/docs/guide/src/docbkx/samples/version-atom.xml
+++ b/docs/guide/src/docbkx/samples/version-atom.xml
@@ -7,13 +7,13 @@
    <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
    <entry>
       <id>http://identity.api.openstack.org/v2.0/</id>
-      <title type="text">Version v1.0</title>
+      <title type="text">Version v2.0</title>
       <updated>2011-01-21T11:33:21-06:00</updated>
       <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
       <link rel="describedby" type="application/pdf"
-           href="http://docs.rackspacecloud.com/identity/api/v2.0/idm-devguide-20110125.pdf"/>
+           href="http://docs.openstack.org/identity/api/v2.0/identity-devguide-20110125.pdf"/>
       <link rel="describedby" type="application/vnd.sun.wadl+xml"
-           href="http://docs.rackspacecloud.com/identity/api/v2.0/application.wadl"/>
-      <content type="text">Version v1.0 CURRENT (2011-01-21T11:33:21-06:00)</content>
+           href="http://docs.openstack.org/identity/api/v2.0/application.wadl"/>
+      <content type="text">Version v2.0 CURRENT (2011-01-21T11:33:21-06:00)</content>
    </entry>
 </feed>
diff --git a/docs/guide/src/docbkx/samples/version.json b/docs/guide/src/docbkx/samples/version.json
index 60953de0..fce09386 100644
--- a/docs/guide/src/docbkx/samples/version.json
+++ b/docs/guide/src/docbkx/samples/version.json
@@ -1,6 +1,6 @@
 {
     "version" : {
-        "id" : "v1.0",
+        "id" : "v2.0",
         "status" : "CURRENT",
         "updated" : "2011-01-21T11:33:21-06:00",
         "links": [
@@ -11,7 +11,7 @@
             {
                 "rel" : "describedby",
                 "type" : "application/pdf",
-                "href" : "http://docs.rackspacecloud.com/identity/api/v2.0/idm-devguide-20110125.pdf"
+                "href" : "http://docs.rackspacecloud.com/identity/api/v2.0/identity-devguide-20110125.pdf"
             },
             {
                 "rel" : "describedby",
diff --git a/docs/guide/src/docbkx/samples/version.xml b/docs/guide/src/docbkx/samples/version.xml
index 08eac21e..0e884504 100644
--- a/docs/guide/src/docbkx/samples/version.xml
+++ b/docs/guide/src/docbkx/samples/version.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <version xmlns="http://docs.openstack.org/common/api/v1.0"
          xmlns:atom="http://www.w3.org/2005/Atom"
-         id="v1.0" status="CURRENT" updated="2011-01-21T11:33:21-06:00">
+         id="v2.0" status="CURRENT" updated="2011-01-21T11:33:21-06:00">
 
      <media-types>
          <media-type base="application/xml"
@@ -15,7 +15,7 @@
 
     <atom:link rel="describedby"
                type="application/pdf"
-               href="http://docs.rackspacecloud.com/identity/api/v2.0/idm-devguide-20110125.pdf" />
+               href="http://docs.rackspacecloud.com/identity/api/v2.0/identity-devguide-20110125.pdf" />
 
     <atom:link rel="describedby"
                type="application/vnd.sun.wadl+xml"
diff --git a/docs/guide/src/docbkx/samples/versions-atom.xml b/docs/guide/src/docbkx/samples/versions-atom.xml
index d9fcade7..55c27318 100644
--- a/docs/guide/src/docbkx/samples/versions-atom.xml
+++ b/docs/guide/src/docbkx/samples/versions-atom.xml
@@ -13,7 +13,7 @@
        <content type="text">Version v1.1 CURRENT (2010-12-12T18:30:02.25Z)</content>
     </entry>
     <entry>
-       <id>http://identity.api.openstack.org/v2.0/</id>
+       <id>http://identity.api.openstack.org/v1.0/</id>
        <title type="text">Version v1.0</title>
        <updated>2009-10-09T11:30:00Z</updated>
        <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
diff --git a/docs/guide/src/docbkx/xsd/api.xsd b/docs/guide/src/docbkx/xsd/api.xsd
index cedb4026..d4603c2e 100644
--- a/docs/guide/src/docbkx/xsd/api.xsd
+++ b/docs/guide/src/docbkx/xsd/api.xsd
@@ -4,7 +4,7 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
+    xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
diff --git a/docs/guide/src/docbkx/xsd/fault.xsd b/docs/guide/src/docbkx/xsd/fault.xsd
index c37c0419..6725e3a4 100644
--- a/docs/guide/src/docbkx/xsd/fault.xsd
+++ b/docs/guide/src/docbkx/xsd/fault.xsd
@@ -4,23 +4,23 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
+    xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
     <!-- Fault Elements -->
-    <element name="idmFault" type="idm:IDMFault"/>
-    <element name="serviceUnavailable" type="idm:ServiceUnavailableFault"/>
-    <element name="badRequest" type="idm:BadRequestFault"/>
-    <element name="unauthorized" type="idm:UnauthorizedFault"/>
-    <element name="overLimit" type="idm:OverLimitFault"/>
-    <element name="userDisabled" type="idm:UserDisabledFault"/>
-    <element name="forbidden" type="idm:ForbiddenFault"/>
-    <element name="itemNotFound" type="idm:ItemNotFoundFault"/>
-    <element name="tenantConflict" type="idm:TenantConflictFault"/>
+    <element name="identityFault" type="identity:IdentityFault"/>
+    <element name="serviceUnavailable" type="identity:ServiceUnavailableFault"/>
+    <element name="badRequest" type="identity:BadRequestFault"/>
+    <element name="unauthorized" type="identity:UnauthorizedFault"/>
+    <element name="overLimit" type="identity:OverLimitFault"/>
+    <element name="userDisabled" type="identity:UserDisabledFault"/>
+    <element name="forbidden" type="identity:ForbiddenFault"/>
+    <element name="itemNotFound" type="identity:ItemNotFoundFault"/>
+    <element name="tenantConflict" type="identity:TenantConflictFault"/>
 
     <!-- Fault Types -->
-    <complexType name="IDMFault">
+    <complexType name="IdentityFault">
         <sequence>
             <element name="message" type="xsd:string">
                 <annotation>
@@ -66,56 +66,56 @@
 
     <complexType name="ServiceUnavailableFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="BadRequestFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="UnauthorizedFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="UserDisabledFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="ForbiddenFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="ItemNotFoundFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="TenantConflictFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
             </extension>
         </complexContent>
     </complexType>
 
     <complexType name="OverLimitFault">
         <complexContent>
-            <extension base="idm:IDMFault">
+            <extension base="identity:IdentityFault">
                 <attribute name="retryAt" type="xsd:dateTime" use="optional">
                     <annotation>
                         <xsd:documentation
diff --git a/docs/guide/src/docbkx/xsd/tenant.xsd b/docs/guide/src/docbkx/xsd/tenant.xsd
index 400ded28..26ef15fe 100644
--- a/docs/guide/src/docbkx/xsd/tenant.xsd
+++ b/docs/guide/src/docbkx/xsd/tenant.xsd
@@ -4,7 +4,7 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
+    xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
     xmlns:atom="http://www.w3.org/2005/Atom"
@@ -15,13 +15,13 @@
             schemaLocation="atom/atom.xsd" />
 
     <!-- Elements -->
-    <element name="tenant" type="idm:Tenant"  />
-    <element name="tenants" type="idm:Tenants" />
+    <element name="tenant" type="identity:Tenant"  />
+    <element name="tenants" type="identity:Tenants" />
 
     <!-- Complex Types -->
     <complexType name="Tenants">
         <sequence>
-            <element name="tenant" type="idm:Tenant" maxOccurs="1000"/>
+            <element name="tenant" type="identity:Tenant" maxOccurs="1000"/>
             <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
diff --git a/docs/guide/src/docbkx/xsd/token.xsd b/docs/guide/src/docbkx/xsd/token.xsd
index de95da4c..888bbebf 100644
--- a/docs/guide/src/docbkx/xsd/token.xsd
+++ b/docs/guide/src/docbkx/xsd/token.xsd
@@ -4,19 +4,19 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
+    xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
     <!-- Elements -->
-    <element name="passwordCredentials" type="idm:PasswordCredentials"/>
-    <element name="auth" type="idm:AuthData"/>
+    <element name="passwordCredentials" type="identity:PasswordCredentials"/>
+    <element name="auth" type="identity:AuthData"/>
 
     <!-- Complex Types -->
     <complexType name="Credentials" abstract="true" />
     <complexType name="PasswordCredentials">
         <complexContent>
-            <extension base="idm:Credentials">
+            <extension base="identity:Credentials">
                 <sequence>
                     <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
                 </sequence>
@@ -30,8 +30,8 @@
 
     <complexType name="AuthData">
         <sequence>
-            <element name="token" type="idm:Token"/>
-            <element name="user" type="idm:User"/>
+            <element name="token" type="identity:Token"/>
+            <element name="user" type="identity:User"/>
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
@@ -48,7 +48,7 @@
 
     <complexType name="User">
         <sequence>
-            <element name="groups" type="idm:Groups" />
+            <element name="groups" type="identity:Groups" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <attribute name="tenantId" type="xsd:string"/>
@@ -58,7 +58,7 @@
 
     <complexType name="Groups">
         <sequence>
-            <element name="group" type="idm:Group" maxOccurs="1000"/>
+            <element name="group" type="identity:Group" maxOccurs="1000"/>
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>