From b7647a2bd7ba6468f9c47da7e2ab2feb8bd18b10 Mon Sep 17 00:00:00 2001
From: Ziad Sawalha <github@highbridgellc.com>
Date: Mon, 22 Aug 2011 22:02:43 -0500
Subject: Updates to samples, XSDs, and WADLs

Change-Id: I89a89a362bd5aaf715f125916d193acf75067b32
---
 .../content/admin/identity-admin-OS-KSADM.wadl     |   6 +-
 keystone/content/admin/identity-admin.wadl         |  13 +-
 .../admin/xsd/OS-KSADM-endpointtemplates.xsd       | 150 +++++++++++++++++++++
 keystone/content/admin/xsd/api-common.xsd          |   3 +-
 keystone/content/admin/xsd/credentials.xsd         |  82 ++++++-----
 keystone/content/admin/xsd/endpoints.xsd           | 116 +++-------------
 keystone/content/admin/xsd/extensions.xsd          |   2 +
 keystone/content/admin/xsd/fault.xsd               |   2 +
 keystone/content/admin/xsd/roles.xsd               |   7 +-
 keystone/content/admin/xsd/services.xsd            |   5 +-
 keystone/content/admin/xsd/tenant.xsd              |  10 +-
 keystone/content/admin/xsd/token.xsd               |   5 +-
 keystone/content/admin/xsd/user.xsd                |  29 ++--
 keystone/content/common/samples/auth.json          |  10 +-
 keystone/content/common/samples/ext-getuser.json   |   1 -
 keystone/content/common/samples/ext-getuser.xml    |   2 +-
 keystone/content/common/samples/getuser-1.json     |   1 -
 keystone/content/common/samples/getuser-1.xml      |   2 +-
 keystone/content/common/samples/service.xml        |   2 +-
 keystone/content/common/samples/user.json          |   4 +-
 keystone/content/common/samples/user.xml           |   2 +-
 keystone/content/common/samples/validatetoken.json |   3 +-
 keystone/content/common/samples/validatetoken.xml  |   7 +-
 keystone/content/service/identity.wadl             |   1 +
 keystone/content/service/xsd/api-common.xsd        |   3 +-
 keystone/content/service/xsd/credentials.xsd       |   8 +-
 keystone/content/service/xsd/endpoints.xsd         | 106 ++-------------
 keystone/content/service/xsd/extensions.xsd        |   2 +
 keystone/content/service/xsd/fault.xsd             |   2 +
 keystone/content/service/xsd/roles.xsd             |   3 +-
 keystone/content/service/xsd/services.xsd          |   2 +
 keystone/content/service/xsd/tenant.xsd            |   9 +-
 keystone/content/service/xsd/token.xsd             |   6 +-
 keystone/content/service/xsd/user.xsd              |   2 +-
 34 files changed, 317 insertions(+), 291 deletions(-)
 create mode 100644 keystone/content/admin/xsd/OS-KSADM-endpointtemplates.xsd

diff --git a/keystone/content/admin/identity-admin-OS-KSADM.wadl b/keystone/content/admin/identity-admin-OS-KSADM.wadl
index f4cb58fe..39c1c4f0 100644
--- a/keystone/content/admin/identity-admin-OS-KSADM.wadl
+++ b/keystone/content/admin/identity-admin-OS-KSADM.wadl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- (C) 2011 Rackspace Hosting, All Rights Reserved -->
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
@@ -14,12 +14,14 @@
 
 <application xmlns="http://wadl.dev.java.net/2009/02"
 	xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
+	xmlns:OS-KSADM="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
 	xmlns:capi="http://docs.openstack.org/common/api/v2.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	xsi:schemaLocation="http://docs.openstack.org/identity/api/v2.0 xsd/api.xsd
 		http://docs.openstack.org/common/api/v1.0 xsd/api-common.xsd
 		http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd
+		http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0 xsd/OS-KSADM-endpointtemplates.xsd
 		">
 
     <grammars>
@@ -444,7 +446,7 @@
             <param name="serviceName" style="query" required="false" type="xsd:string"/>
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml" element="identity:endpointTemplates"/>
+            <representation mediaType="application/xml" element="OS-KSADM:endpointTemplates"/>
             <representation mediaType="application/json"/>
         </response>
         &commonFaults;
diff --git a/keystone/content/admin/identity-admin.wadl b/keystone/content/admin/identity-admin.wadl
index a1ee1c97..d57dbcd3 100644
--- a/keystone/content/admin/identity-admin.wadl
+++ b/keystone/content/admin/identity-admin.wadl
@@ -162,18 +162,19 @@
             </p>
         </doc>
         <request>
-            <representation mediaType="application/xml" element="identity:passwordCredentials">
-                <param name="passwordCredentials" style="plain" required="true"
-                    type="identity:PasswordCredentialsWithoutUsername"
-                    path="/identity:passwordCredentials"/>
-            </representation>
+            <representation mediaType="application/xml" element="identity:auth"/>
             <representation mediaType="application/json"/>
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml" element="identity:authenticateResponse"/>
+            <representation mediaType="application/xml" element="identity:access"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="403">
+            <representation mediaType="application/xml" element="identity:userDisabled"/>
             <representation mediaType="application/json"/>
         </response>
         &commonFaults;
+        &getFaults;
     </method>
     <method name="GET" id="validateToken">
         <doc xml:lang="EN" title="/tokens/{token_id}">
diff --git a/keystone/content/admin/xsd/OS-KSADM-endpointtemplates.xsd b/keystone/content/admin/xsd/OS-KSADM-endpointtemplates.xsd
new file mode 100644
index 00000000..3ab7d4d2
--- /dev/null
+++ b/keystone/content/admin/xsd/OS-KSADM-endpointtemplates.xsd
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
+
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
+<schema
+        elementFormDefault="qualified"
+        attributeFormDefault="unqualified"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
+        xmlns:OS-KSADM="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+        xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
+        xmlns:atom="http://www.w3.org/2005/Atom"
+        targetNamespace="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
+    >
+    
+    <!-- Import ATOM specific schema definitions -->
+    <import vc:minVersion="1.1" namespace="http://www.w3.org/2005/Atom"
+            schemaLocation="atom/atom.xsd" />
+
+    <element name="endpointTemplates" type="OS-KSADM:EndpointTemplateList">
+        <annotation>
+            <xsd:documentation
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
+                <p>
+                    A list of Endpoint Templates.
+                </p>
+            </xsd:documentation>
+        </annotation>
+    </element>
+    
+    <element name="endpointTemplate" type="OS-KSADM:EndpointTemplate">
+        <annotation>
+            <xsd:documentation
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
+                <p>
+                    An Endpoint Template.
+                </p>
+            </xsd:documentation>
+        </annotation>
+    </element>
+
+    <!-- Complex Types -->
+    <complexType name="EndpointTemplate">
+        <attribute name="id" type="xsd:int" use="required">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        An ID uniquely identifying the Endpoint Template.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <attribute name="serviceName" type="xsd:string" use="required">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        The service name of Endpoint Template.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <attribute name="region" type="xsd:string" use="optional">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        The region of Endpoint Template.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <attribute name="publicURL" type="xsd:anyURI" use="required">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        The public URL to access represented service.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <attribute name="internalURL" type="xsd:anyURI" use="optional">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        The internal version of the public URL.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <attribute name="adminURL" type="xsd:anyURI" use="optional">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        The admin URL.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <attribute name="global" type="xsd:boolean" default="false" use="optional">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        If true the Endpoint Template is automatically part of every account.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <attribute name="enabled" type="xsd:boolean" default="true" use="optional">
+            <annotation>
+                <xsd:documentation
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        True if the Endpoint Template is enabled (active). 
+                        A Endpoint Template cannot be added if it's disabled or inactive (false). 
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+
+    <complexType name="EndpointTemplateList">
+        <sequence>
+            <element name="endpointTemplate" type="OS-KSADM:EndpointTemplate" minOccurs="0" maxOccurs="unbounded"/>
+            <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
+            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+        </sequence>
+         <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+
+</schema>
diff --git a/keystone/content/admin/xsd/api-common.xsd b/keystone/content/admin/xsd/api-common.xsd
index 5e8ebeda..0625e5be 100644
--- a/keystone/content/admin/xsd/api-common.xsd
+++ b/keystone/content/admin/xsd/api-common.xsd
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
-<!-- (C) 2009-2011 Rackspace Hosting, All Rights Reserved -->
-
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
diff --git a/keystone/content/admin/xsd/credentials.xsd b/keystone/content/admin/xsd/credentials.xsd
index dbe7f4d8..7c68f7f1 100644
--- a/keystone/content/admin/xsd/credentials.xsd
+++ b/keystone/content/admin/xsd/credentials.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
-<!-- (C) 2010 Rackspace Hosting, All Rights Reserved -->
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
@@ -13,56 +13,68 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:atom="http://www.w3.org/2005/Atom"
     targetNamespace="http://docs.openstack.org/identity/api/v2.0" 
->
-
-    <!-- Import ATOM specific schema definitions -->
-    <import vc:minVersion="1.1" namespace="http://www.w3.org/2005/Atom"
-            schemaLocation="atom/atom.xsd" />
-
+    >
     <!-- Elements -->
-    <element name="passwordCredentials" type="identity:PasswordCredentials"/>
+    <element name="auth" type="identity:AuthenticationRequest"/>
     
-    <element name="credentials" type="identity:CredentialList"  >
+    <!-- Complex Types -->
+    <complexType name="CredentialType" abstract="true">
         <annotation>
             <xsd:documentation
-                    xml:lang="EN"
-                    xmlns="http://www.w3.org/2001/XMLSchema">
+                xml:lang="EN"
+                xmlns="http://www.w3.org/1999/xhtml">
                 <p>
-                    A list of credentials.
+                    Base type for credentials in Keystone.
                 </p>
             </xsd:documentation>
         </annotation>
-    </element>
-    
-    <!-- Complex Types -->
-    <complexType name="Credential" abstract="true">
-        <attribute name="id" type="xsd:ID" use="optional"/>
+        <sequence>
+            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+        </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>        
     </complexType>
-    <complexType name="CredentialType" abstract="true">
-        <anyAttribute namespace="##other" processContents="lax"/>        
+    <complexType name="AuthenticationRequest">
+        <sequence>
+            <choice minOccurs="1">
+                <element name="passwordCredentials" type="identity:PasswordCredentialsRequiredUsername"/>
+                <any namespace="##other" processContents="lax">
+                    <annotation>
+                        <xsd:documentation
+                            xml:lang="EN"
+                            xmlns="http://www.w3.org/1999/xhtml">
+                            <p>
+                                This is reserved for other credential types.
+                            </p>
+                        </xsd:documentation>
+                    </annotation>
+                </any>
+            </choice>
+            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="tenantId" type="xsd:string" use="optional"/>
     </complexType>
-    
-    <complexType name="PasswordCredentials">
+    <complexType name="PasswordCredentialsBase">
         <complexContent>
             <extension base="identity:CredentialType">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-                </sequence>
-                <attribute name="password" type="xsd:string" use="required" />
                 <attribute name="username" type="xsd:string" use="optional" />
-                <anyAttribute namespace="##other" processContents="lax"/>
+                <attribute name="password" type="xsd:string" use="required" />
             </extension>
         </complexContent>
     </complexType>
-
-    <complexType name="CredentialList">
-        <sequence>
-            <element name="credential" type="identity:Credential" minOccurs="0" maxOccurs="unbounded"/>
-            <!-- TODO(Ziad): resolve conflict <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-        </sequence>
-        <anyAttribute namespace="##other" processContents="lax"/>
+    <complexType name="PasswordCredentialsWithoutUsername">
+        <complexContent>
+            <restriction base="identity:PasswordCredentialsBase">
+                <attribute name="username" type="xsd:string" use="prohibited" />
+                <attribute name="password" type="xsd:string" use="required" />
+            </restriction>
+        </complexContent>
     </complexType>
-    
+    <complexType name="PasswordCredentialsRequiredUsername">
+        <complexContent>
+            <restriction base="identity:PasswordCredentialsBase">
+                <attribute name="username" type="xsd:string" use="required" />
+                <attribute name="password" type="xsd:string" use="required" />
+            </restriction>
+        </complexContent>
+    </complexType>  
 </schema>
diff --git a/keystone/content/admin/xsd/endpoints.xsd b/keystone/content/admin/xsd/endpoints.xsd
index 65fc3be8..2c4336e6 100644
--- a/keystone/content/admin/xsd/endpoints.xsd
+++ b/keystone/content/admin/xsd/endpoints.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
         elementFormDefault="qualified"
         attributeFormDefault="unqualified"
@@ -17,29 +19,6 @@
     <import vc:minVersion="1.1" namespace="http://www.w3.org/2005/Atom"
             schemaLocation="atom/atom.xsd" />
 
-    <element name="endpointTemplates" type="identity:EndpointTemplateList">
-        <annotation>
-            <xsd:documentation
-                    xml:lang="EN"
-                    xmlns="http://www.w3.org/1999/xhtml">
-                <p>
-                    A list of Endpoint Templates.
-                </p>
-            </xsd:documentation>
-        </annotation>
-    </element>
-    
-    <element name="endpointTemplate" type="identity:EndpointTemplate">
-        <annotation>
-            <xsd:documentation
-                    xml:lang="EN"
-                    xmlns="http://www.w3.org/1999/xhtml">
-                <p>
-                    An Endpoint Template.
-                </p>
-            </xsd:documentation>
-        </annotation>
-    </element>
     <element name="endpoint" type="identity:Endpoint">
         <annotation>
             <xsd:documentation
@@ -64,25 +43,25 @@
     </element>
 
     <!-- Complex Types -->
-    <complexType name="EndpointTemplate">
+    <complexType name="Endpoint">
         <attribute name="id" type="xsd:int" use="required">
             <annotation>
                 <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
                     <p>
-                        An ID uniquely identifying the Endpoint Template.
+                        An ID uniquely identifying the Endpoint.
                     </p>
                 </xsd:documentation>
             </annotation>
         </attribute>
-        <attribute name="serviceName" type="xsd:string" use="required">
+        <attribute name="href" type="xsd:anyURI" use="optional">
             <annotation>
                 <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
                     <p>
-                        The service name of Endpoint Template.
+                        A hyperlink reference to the URL Endpoint Template.
                     </p>
                 </xsd:documentation>
             </annotation>
@@ -90,8 +69,8 @@
         <attribute name="region" type="xsd:string" use="optional">
             <annotation>
                 <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
                     <p>
                         The region of Endpoint Template.
                     </p>
@@ -101,8 +80,8 @@
         <attribute name="publicURL" type="xsd:anyURI" use="required">
             <annotation>
                 <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
                     <p>
                         The public URL to access represented service.
                     </p>
@@ -112,8 +91,8 @@
         <attribute name="internalURL" type="xsd:anyURI" use="optional">
             <annotation>
                 <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
                     <p>
                         The internal version of the public URL.
                     </p>
@@ -121,81 +100,22 @@
             </annotation>
         </attribute>
         <attribute name="adminURL" type="xsd:anyURI" use="optional">
-            <annotation>
-                <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                    <p>
-                        The admin URL.
-                    </p>
-                </xsd:documentation>
-            </annotation>
-        </attribute>
-        <attribute name="global" type="xsd:boolean" default="false" use="optional">
-            <annotation>
-                <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                    <p>
-                        If true the Endpoint Template is automatically part of every account.
-                    </p>
-                </xsd:documentation>
-            </annotation>
-        </attribute>
-        <attribute name="enabled" type="xsd:boolean" default="true" use="optional">
             <annotation>
                 <xsd:documentation
                     xml:lang="EN"
                     xmlns="http://www.w3.org/1999/xhtml">
                     <p>
-                        True if the Endpoint Template is enabled (active). 
-                        A Endpoint Template cannot be added if it's disabled or inactive (false). 
-                    </p>
-                </xsd:documentation>
-            </annotation>
-        </attribute>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-
-    <complexType name="Endpoint">
-        <attribute name="id" type="xsd:int" use="required">
-            <annotation>
-                <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                    <p>
-                        An ID uniquely identifying the Endpoint.
-                    </p>
-                </xsd:documentation>
-            </annotation>
-        </attribute>
-        <attribute name="href" type="xsd:anyURI" use="optional">
-            <annotation>
-                <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                    <p>
-                        A hyperlink reference to the URL Endpoint Template.
+                        The admin URL.
                     </p>
                 </xsd:documentation>
             </annotation>
         </attribute>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
-
-    <complexType name="EndpointTemplateList">
-        <sequence>
-            <element name="endpointTemplate" type="identity:EndpointTemplate" minOccurs="0" maxOccurs="unbounded"/>
-            <!-- TODO(Ziad): resolve conflict <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-        </sequence>
-         <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-
     <complexType name="EndpointList">
         <sequence>
             <element name="endpoint" type="identity:Endpoint" minOccurs="0" maxOccurs="unbounded"/>
-            <!-- TODO(Ziad): resolve conflict <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
+            <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
diff --git a/keystone/content/admin/xsd/extensions.xsd b/keystone/content/admin/xsd/extensions.xsd
index 098d7e10..f81a04be 100644
--- a/keystone/content/admin/xsd/extensions.xsd
+++ b/keystone/content/admin/xsd/extensions.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified"
            targetNamespace="http://docs.openstack.org/common/api/v1.0"
            xmlns:ext="http://docs.openstack.org/common/api/v1.0"
diff --git a/keystone/content/admin/xsd/fault.xsd b/keystone/content/admin/xsd/fault.xsd
index c0894117..4776ddaf 100644
--- a/keystone/content/admin/xsd/fault.xsd
+++ b/keystone/content/admin/xsd/fault.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
diff --git a/keystone/content/admin/xsd/roles.xsd b/keystone/content/admin/xsd/roles.xsd
index 444290f6..417471a5 100644
--- a/keystone/content/admin/xsd/roles.xsd
+++ b/keystone/content/admin/xsd/roles.xsd
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
+
 <schema
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
@@ -46,7 +49,7 @@
     <!-- Complex Types -->
     <complexType name="Role">
         <sequence>
-            <!-- TODO(Ziad): resolve conflict <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
+            <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <attribute name="id" type="xsd:string" use="required"/>
@@ -59,7 +62,7 @@
     <complexType name="RoleList">
         <sequence>
             <element name="role" type="identity:Role" minOccurs="0" maxOccurs="unbounded"/>
-            <!-- TODO(Ziad): resolve conflict <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
+            <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
diff --git a/keystone/content/admin/xsd/services.xsd b/keystone/content/admin/xsd/services.xsd
index 1ae3a30a..b2d2dd8c 100644
--- a/keystone/content/admin/xsd/services.xsd
+++ b/keystone/content/admin/xsd/services.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
@@ -46,6 +48,7 @@
     <!-- Complex Types -->
     <complexType name="Service">
         <attribute name="id" type="xsd:string" use="required"/>
+        <attribute name="type" type="identity:ExtensibleServiceType" use="required"/>
         <attribute name="description" type="xsd:string"  use="optional"/>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
@@ -53,7 +56,7 @@
     <complexType name="ServiceList">
         <sequence>
             <element name="service" type="identity:Service" minOccurs="0" maxOccurs="unbounded"/>
-            <!--<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
+            <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
diff --git a/keystone/content/admin/xsd/tenant.xsd b/keystone/content/admin/xsd/tenant.xsd
index 3a581504..9c836ea8 100644
--- a/keystone/content/admin/xsd/tenant.xsd
+++ b/keystone/content/admin/xsd/tenant.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
@@ -87,13 +89,13 @@
                 </xsd:documentation>
             </annotation>
         </attribute>
-        <attribute name="name" type="xsd:string" use="optional">
+        <attribute name="name" type="xsd:string" use="required">
             <annotation>
                 <xsd:documentation
                     xml:lang="EN"
                     xmlns="http://www.w3.org/1999/xhtml">
                     <p>
-                        The name of the tenant. This is guaranteed to be unique, bit it can change.
+                        The name of the tenant. This is guaranteed to be unique, but may change.
                     </p>
                 </xsd:documentation>
             </annotation>
@@ -121,7 +123,7 @@
                 </xsd:documentation>
             </annotation>
         </attribute>
-        <attribute type="xsd:dateTime"    name="updated" use="optional">
+        <attribute type="xsd:dateTime" name="updated" use="optional">
             <annotation>
                 <xsd:documentation
                     xml:lang="EN"
@@ -133,7 +135,7 @@
                 </xsd:documentation>
             </annotation>
         </attribute>
-        <attribute type="xsd:dateTime"    name="created" use="optional">
+        <attribute type="xsd:dateTime" name="created" use="optional">
             <annotation>
                 <xsd:documentation
                     xml:lang="EN"
diff --git a/keystone/content/admin/xsd/token.xsd b/keystone/content/admin/xsd/token.xsd
index 18b9b437..7ae3f91d 100644
--- a/keystone/content/admin/xsd/token.xsd
+++ b/keystone/content/admin/xsd/token.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
@@ -16,7 +18,7 @@
     <include schemaLocation="user.xsd"/>
     
     <!-- Elements -->
-    <element name="auth" type="identity:AuthenticateResponse"/>
+    <element name="access" type="identity:AuthenticateResponse"/>
     
     <!-- Complex Types -->
     <complexType name="Token">
@@ -69,7 +71,6 @@
             <element name="roles" type="identity:RoleList" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
-        <attribute name="tenantId" type="xsd:string" use="optional"/>
         <attribute name="username" type="xsd:string"/>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
diff --git a/keystone/content/admin/xsd/user.xsd b/keystone/content/admin/xsd/user.xsd
index ee8d22a4..b0a1123e 100644
--- a/keystone/content/admin/xsd/user.xsd
+++ b/keystone/content/admin/xsd/user.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
-<!-- (C) 2010 Rackspace Hosting, All Rights Reserved -->
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
@@ -44,18 +44,19 @@
     </element>
 
     <!-- Complex Types -->
-    <complexType name="User"><attribute name="id" type="xsd:ID" use="required">            
-        <annotation>
-            <xsd:documentation
-                xml:lang="EN"
-                xmlns="http://www.w3.org/1999/xhtml">
-                <p>
-                    An automatically generated, unique, immutable (it will never change) identifier
-                    for the user. This is generated by the backend this user is stored in.
-                </p>
-            </xsd:documentation>
-        </annotation>
-    </attribute>
+    <complexType name="User">
+        <attribute name="id" type="xsd:ID" use="required">            
+            <annotation>
+                <xsd:documentation
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        An automatically generated, unique, immutable (it will never change) identifier
+                        for the user. This is generated by the backend this user is stored in.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
         <attribute name="username" type="xsd:string" use="required">            
             <annotation>
                 <xsd:documentation
@@ -122,7 +123,7 @@
     <complexType name="UserList">
         <sequence>
             <element name="user" type="identity:User" minOccurs="0" maxOccurs="unbounded"/>
-            <!--<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
+            <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
diff --git a/keystone/content/common/samples/auth.json b/keystone/content/common/samples/auth.json
index 60d5a251..76583b02 100644
--- a/keystone/content/common/samples/auth.json
+++ b/keystone/content/common/samples/auth.json
@@ -14,7 +14,7 @@
             "internalURL": "https://compute.north.host/v1/1234",
             "region": "North",
             "tenantId": "1234",
-            "versionId": "v1.0",
+            "versionId": "1.0",
             "versionInfo": "https://compute.north.host/v1.0/",
             "versionList": "https://compute.north.host/"
           }, {
@@ -22,21 +22,21 @@
             "internalURL": "https://compute.north.host/v1.1/3456",
             "region": "North",
             "tenantId": "3456",
-            "versionId": "v1.1",
+            "versionId": "1.1",
             "versionInfo": "https://compute.north.host/v1.1/",
             "versionList": "https://compute.north.host/"
           }
         ]
       }, {
         "name": "Cloud Files",
-        "type": "object store",
+        "type": "object-store",
         "endpoints": [
           {
             "publicURL": "https://compute.north.host/v1/blah-blah",
             "internalURL": "https://compute.north.host/v1/blah-blah",
             "region": "South",
             "tenantId": "1234",
-            "versionId": "v1.0",
+            "versionId": "1.0",
             "versionInfo": "uri",
             "versionList": "uri"
           }, {
@@ -44,7 +44,7 @@
             "internalURL": "https://compute.north.host/v1.1/blah-blah",
             "region": "South",
             "tenantId": "3456",
-            "versionId": "v1.1",
+            "versionId": "1.1",
             "versionInfo": "https://compute.north.host/v1.1/",
             "versionList": "https://compute.north.host/"
           }
diff --git a/keystone/content/common/samples/ext-getuser.json b/keystone/content/common/samples/ext-getuser.json
index 7c068157..b1c80306 100644
--- a/keystone/content/common/samples/ext-getuser.json
+++ b/keystone/content/common/samples/ext-getuser.json
@@ -10,7 +10,6 @@
     },
     "id": "u1000",
     "username": "jqsmith",
-    "tenantId": "1234",
     "email": "john.smith@example.org",
     "enabled": true,
     "RS-META:metadata": {
diff --git a/keystone/content/common/samples/ext-getuser.xml b/keystone/content/common/samples/ext-getuser.xml
index 43e707be..b155904a 100644
--- a/keystone/content/common/samples/ext-getuser.xml
+++ b/keystone/content/common/samples/ext-getuser.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <user xmlns="http://docs.openstack.org/identity/api/v2.0"
       enabled="true" email="john.smith@example.org"
-      tenantId="1234" id="u1000" username="jqsmith">
+      id="u1000" username="jqsmith">
     <roles>
         <role tenantId="1234" id="Admin"/>
     </roles>
diff --git a/keystone/content/common/samples/getuser-1.json b/keystone/content/common/samples/getuser-1.json
index be8ebd66..1439651d 100644
--- a/keystone/content/common/samples/getuser-1.json
+++ b/keystone/content/common/samples/getuser-1.json
@@ -19,7 +19,6 @@
     },
     "id": "u1000",
     "username": "jqsmith",
-    "tenantId": "1234",
     "email": "john.smith@example.org",
     "enabled": true
   }
diff --git a/keystone/content/common/samples/getuser-1.xml b/keystone/content/common/samples/getuser-1.xml
index 61cd862a..531a229f 100644
--- a/keystone/content/common/samples/getuser-1.xml
+++ b/keystone/content/common/samples/getuser-1.xml
@@ -2,7 +2,7 @@
 <user xmlns="http://docs.openstack.org/identity/api/v2.0"
       xmlns:atom="http://www.w3.org/2005/Atom"
       enabled="true" email="john.smith@example.org"
-      tenantId="1234" id="jqsmith">
+      username="jqsmith" id="u1000">
     <roles>
         <role tenantId="1234" id="Admin"/>
         <role tenantId="1234" id="DBUser"/>
diff --git a/keystone/content/common/samples/service.xml b/keystone/content/common/samples/service.xml
index 9c6d4eab..f79a6724 100644
--- a/keystone/content/common/samples/service.xml
+++ b/keystone/content/common/samples/service.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <service xmlns="http://docs.openstack.org/identity/api/v2.0" id="nova"
- type="compute" description="All Access" />
+ type="compute" description="OpenStack Compute Service" />
diff --git a/keystone/content/common/samples/user.json b/keystone/content/common/samples/user.json
index 3106b4b9..1623e95d 100644
--- a/keystone/content/common/samples/user.json
+++ b/keystone/content/common/samples/user.json
@@ -1,7 +1,7 @@
 {
   "user": {
-    "id": "jqsmith",
-    "tenantId": "1234",
+    "id": "u1000",
+    "username": "jqsmith",
     "email": "john.smith@example.org",
     "enabled": true
 	}
diff --git a/keystone/content/common/samples/user.xml b/keystone/content/common/samples/user.xml
index fb776a6b..af035dee 100644
--- a/keystone/content/common/samples/user.xml
+++ b/keystone/content/common/samples/user.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <user xmlns="http://docs.openstack.org/identity/api/v2.0"
       enabled="true" email="john.smith@example.org"
-      tenantId="1234" id="jqsmith">
+      username="jqsmith" id="u1000">
 </user>
diff --git a/keystone/content/common/samples/validatetoken.json b/keystone/content/common/samples/validatetoken.json
index 3eff4601..6f655374 100644
--- a/keystone/content/common/samples/validatetoken.json
+++ b/keystone/content/common/samples/validatetoken.json
@@ -2,8 +2,7 @@
   "auth": {
     "token": {
       "expires": "2010-11-01T03:32:15-05:00",
-      "id": "ab48a9efdfedb23ty3494",
-      "tenantId": "1234"
+      "id": "ab48a9efdfedb23ty3494"
     },
     "user": {
       "username": "jqsmith",
diff --git a/keystone/content/common/samples/validatetoken.xml b/keystone/content/common/samples/validatetoken.xml
index 8e454f38..5987ff46 100644
--- a/keystone/content/common/samples/validatetoken.xml
+++ b/keystone/content/common/samples/validatetoken.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <auth xmlns="http://docs.openstack.org/identity/api/v2.0">
 	<token expires="2010-11-01T03:32:15-05:00"
-		id="ab48a9efdfedb23ty3494"
-		tenantId="1234"/>
+		id="ab48a9efdfedb23ty3494"/>
 	<user username="jqsmith">
 		<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
 			<role xmlns="http://docs.openstack.org/identity/api/v2.0"
-				id="Admin" tenantId="1234"/>
+				id="Admin" tenantId="one"/>
 			<role xmlns="http://docs.openstack.org/identity/api/v2.0"
-				id="Admin"/>
+				id="compute:cloud_admin"/>
 		</roles>
 	</user>
 </auth>
diff --git a/keystone/content/service/identity.wadl b/keystone/content/service/identity.wadl
index b214e3ef..263bfe18 100644
--- a/keystone/content/service/identity.wadl
+++ b/keystone/content/service/identity.wadl
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
diff --git a/keystone/content/service/xsd/api-common.xsd b/keystone/content/service/xsd/api-common.xsd
index 5e8ebeda..0625e5be 100644
--- a/keystone/content/service/xsd/api-common.xsd
+++ b/keystone/content/service/xsd/api-common.xsd
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
-<!-- (C) 2009-2011 Rackspace Hosting, All Rights Reserved -->
-
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
diff --git a/keystone/content/service/xsd/credentials.xsd b/keystone/content/service/xsd/credentials.xsd
index 468dc954..c38b3ec5 100644
--- a/keystone/content/service/xsd/credentials.xsd
+++ b/keystone/content/service/xsd/credentials.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
-<!-- (C) 2010 Rackspace Hosting, All Rights Reserved -->
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
@@ -36,7 +36,7 @@
     <complexType name="AuthenticationRequest">
         <sequence>
             <choice minOccurs="1">
-                <element name="passwordCredentials" type="identity:PasswordCredentialsBase"/>
+                <element name="passwordCredentials" type="identity:PasswordCredentialsRequiredUsername"/>
                 <any namespace="##other" processContents="lax">
                     <annotation>
                         <xsd:documentation
@@ -51,7 +51,7 @@
             </choice>
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
         </sequence>
-        <attribute name="tenantId" type="xsd:string"/>
+        <attribute name="tenantId" type="xsd:string" use="optional"/>
     </complexType>
     <complexType name="PasswordCredentialsBase">
         <complexContent>
@@ -61,7 +61,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <complexType name="PasswordCredentialsWithoutUsernameAndTenant">
+    <complexType name="PasswordCredentialsWithoutUsername">
         <complexContent>
             <restriction base="identity:PasswordCredentialsBase">
                 <attribute name="username" type="xsd:string" use="prohibited" />
diff --git a/keystone/content/service/xsd/endpoints.xsd b/keystone/content/service/xsd/endpoints.xsd
index 5125483d..773e46d3 100644
--- a/keystone/content/service/xsd/endpoints.xsd
+++ b/keystone/content/service/xsd/endpoints.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
         elementFormDefault="qualified"
         attributeFormDefault="unqualified"
@@ -17,29 +19,6 @@
     <import vc:minVersion="1.1" namespace="http://www.w3.org/2005/Atom"
             schemaLocation="atom/atom.xsd" />
 
-    <element name="endpointTemplates" type="identity:EndpointTemplateList">
-        <annotation>
-            <xsd:documentation
-                    xml:lang="EN"
-                    xmlns="http://www.w3.org/1999/xhtml">
-                <p>
-                    A list of Endpoint Templates.
-                </p>
-            </xsd:documentation>
-        </annotation>
-    </element>
-    
-    <element name="endpointTemplate" type="identity:EndpointTemplate">
-        <annotation>
-            <xsd:documentation
-                    xml:lang="EN"
-                    xmlns="http://www.w3.org/1999/xhtml">
-                <p>
-                    An Endpoint Template.
-                </p>
-            </xsd:documentation>
-        </annotation>
-    </element>
     <element name="endpoint" type="identity:Endpoint">
         <annotation>
             <xsd:documentation
@@ -64,25 +43,25 @@
     </element>
 
     <!-- Complex Types -->
-    <complexType name="EndpointTemplate">
+    <complexType name="Endpoint">
         <attribute name="id" type="xsd:int" use="required">
             <annotation>
                 <xsd:documentation
                         xml:lang="EN"
                         xmlns="http://www.w3.org/1999/xhtml">
                     <p>
-                        An ID uniquely identifying the Endpoint Template.
+                        An ID uniquely identifying the Endpoint.
                     </p>
                 </xsd:documentation>
             </annotation>
         </attribute>
-        <attribute name="serviceName" type="xsd:string" use="required">
+        <attribute name="href" type="xsd:anyURI" use="optional">
             <annotation>
                 <xsd:documentation
                         xml:lang="EN"
                         xmlns="http://www.w3.org/1999/xhtml">
                     <p>
-                        The service name of Endpoint Template.
+                        A hyperlink reference to the URL Endpoint Template.
                     </p>
                 </xsd:documentation>
             </annotation>
@@ -90,8 +69,8 @@
         <attribute name="region" type="xsd:string" use="optional">
             <annotation>
                 <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
                     <p>
                         The region of Endpoint Template.
                     </p>
@@ -101,8 +80,8 @@
         <attribute name="publicURL" type="xsd:anyURI" use="required">
             <annotation>
                 <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
                     <p>
                         The public URL to access represented service.
                     </p>
@@ -112,8 +91,8 @@
         <attribute name="internalURL" type="xsd:anyURI" use="optional">
             <annotation>
                 <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
+                    xml:lang="EN"
+                    xmlns="http://www.w3.org/1999/xhtml">
                     <p>
                         The internal version of the public URL.
                     </p>
@@ -121,77 +100,18 @@
             </annotation>
         </attribute>
         <attribute name="adminURL" type="xsd:anyURI" use="optional">
-            <annotation>
-                <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                    <p>
-                        The admin URL.
-                    </p>
-                </xsd:documentation>
-            </annotation>
-        </attribute>
-        <attribute name="global" type="xsd:boolean" default="false" use="optional">
-            <annotation>
-                <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                    <p>
-                        If true the Endpoint Template is automatically part of every account.
-                    </p>
-                </xsd:documentation>
-            </annotation>
-        </attribute>
-        <attribute name="enabled" type="xsd:boolean" default="true" use="optional">
             <annotation>
                 <xsd:documentation
                     xml:lang="EN"
                     xmlns="http://www.w3.org/1999/xhtml">
                     <p>
-                        True if the Endpoint Template is enabled (active). 
-                        A Endpoint Template cannot be added if it's disabled or inactive (false). 
-                    </p>
-                </xsd:documentation>
-            </annotation>
-        </attribute>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-
-    <complexType name="Endpoint">
-        <attribute name="id" type="xsd:int" use="required">
-            <annotation>
-                <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                    <p>
-                        An ID uniquely identifying the Endpoint.
-                    </p>
-                </xsd:documentation>
-            </annotation>
-        </attribute>
-        <attribute name="href" type="xsd:anyURI" use="optional">
-            <annotation>
-                <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                    <p>
-                        A hyperlink reference to the URL Endpoint Template.
+                        The admin URL.
                     </p>
                 </xsd:documentation>
             </annotation>
         </attribute>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
-
-    <complexType name="EndpointTemplateList">
-        <sequence>
-            <element name="endpointTemplate" type="identity:EndpointTemplate" minOccurs="0" maxOccurs="unbounded"/>
-            <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-        </sequence>
-         <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-
     <complexType name="EndpointList">
         <sequence>
             <element name="endpoint" type="identity:Endpoint" minOccurs="0" maxOccurs="unbounded"/>
diff --git a/keystone/content/service/xsd/extensions.xsd b/keystone/content/service/xsd/extensions.xsd
index 098d7e10..f81a04be 100644
--- a/keystone/content/service/xsd/extensions.xsd
+++ b/keystone/content/service/xsd/extensions.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified"
            targetNamespace="http://docs.openstack.org/common/api/v1.0"
            xmlns:ext="http://docs.openstack.org/common/api/v1.0"
diff --git a/keystone/content/service/xsd/fault.xsd b/keystone/content/service/xsd/fault.xsd
index c0894117..4776ddaf 100644
--- a/keystone/content/service/xsd/fault.xsd
+++ b/keystone/content/service/xsd/fault.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
diff --git a/keystone/content/service/xsd/roles.xsd b/keystone/content/service/xsd/roles.xsd
index 860ca771..08639bb8 100644
--- a/keystone/content/service/xsd/roles.xsd
+++ b/keystone/content/service/xsd/roles.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
@@ -64,5 +66,4 @@
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
-    
 </schema>
\ No newline at end of file
diff --git a/keystone/content/service/xsd/services.xsd b/keystone/content/service/xsd/services.xsd
index e173528a..b2d2dd8c 100644
--- a/keystone/content/service/xsd/services.xsd
+++ b/keystone/content/service/xsd/services.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
diff --git a/keystone/content/service/xsd/tenant.xsd b/keystone/content/service/xsd/tenant.xsd
index b6a2da00..9c836ea8 100644
--- a/keystone/content/service/xsd/tenant.xsd
+++ b/keystone/content/service/xsd/tenant.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
@@ -82,11 +84,12 @@
                     xmlns="http://www.w3.org/1999/xhtml">
                     <p>
                         An ID uniquely identifying the tenant. This usually comes from the back-end store.
+                        This value is guaranteed to be unique and immutable (it will never change).
                     </p>
                 </xsd:documentation>
             </annotation>
         </attribute>
-        <attribute name="name" type="xsd:string" use="optional">
+        <attribute name="name" type="xsd:string" use="required">
             <annotation>
                 <xsd:documentation
                     xml:lang="EN"
@@ -120,7 +123,7 @@
                 </xsd:documentation>
             </annotation>
         </attribute>
-        <attribute type="xsd:dateTime"    name="updated" use="optional">
+        <attribute type="xsd:dateTime" name="updated" use="optional">
             <annotation>
                 <xsd:documentation
                     xml:lang="EN"
@@ -132,7 +135,7 @@
                 </xsd:documentation>
             </annotation>
         </attribute>
-        <attribute type="xsd:dateTime"    name="created" use="optional">
+        <attribute type="xsd:dateTime" name="created" use="optional">
             <annotation>
                 <xsd:documentation
                     xml:lang="EN"
diff --git a/keystone/content/service/xsd/token.xsd b/keystone/content/service/xsd/token.xsd
index 52fae4e6..a7ff8d28 100644
--- a/keystone/content/service/xsd/token.xsd
+++ b/keystone/content/service/xsd/token.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+
 <schema
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
@@ -56,7 +58,7 @@
         <attribute name="id" type="xsd:string" use="required"/>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
- 
+
     <complexType name="AuthenticateResponse">
         <sequence>
             <element name="token" type="identity:Token"/>
@@ -66,7 +68,7 @@
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
-    
+
     <complexType name="UserForAuthenticateResponse">
         <sequence>
             <element name="roles" type="identity:RoleList" />
diff --git a/keystone/content/service/xsd/user.xsd b/keystone/content/service/xsd/user.xsd
index 1a036b1a..b0a1123e 100644
--- a/keystone/content/service/xsd/user.xsd
+++ b/keystone/content/service/xsd/user.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
 
-<!-- (C) 2010 Rackspace Hosting, All Rights Reserved -->
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
-- 
cgit