From 64bfcfea2e90f1a1baa7d8b68fed60525da51a82 Mon Sep 17 00:00:00 2001
From: Yogeshwar Srikrishnan <yoga80@yahoo.com>
Date: Thu, 1 Sep 2011 12:09:00 -0500
Subject: Adding wadl for OS-KSCATALOG extension.Fixing existing xsds.Fixing
 service wadls. Merging changes. Change-Id:
 Id29dc19cbc89f47e21329e531fc33bd66c14cf61

---
 keystone/content/admin/OS-KSADM-admin.wadl         |  443 ++++++
 keystone/content/admin/OS-KSCATALOG-admin.wadl     |  165 +++
 keystone/content/admin/RAX-KSKEY-admin.wadl        |  251 ----
 .../content/admin/identity-admin-OS-KSADM.wadl     |  640 ---------
 .../content/admin/identity-admin-RAX-KSADM.wadl    | 1455 --------------------
 .../common/xsd/OS-KSCATALOG-endpointtemplates.xsd  |  150 ++
 .../content/common/xsd/RAX-KSADM-credentials.xsd   |    1 -
 keystone/content/common/xsd/RAX-KSADM-groups.xsd   |   47 -
 keystone/content/common/xsd/credentials.xsd        |   29 +-
 keystone/content/common/xsd/token.xsd              |   91 +-
 keystone/content/service/identity.wadl             |    1 -
 11 files changed, 786 insertions(+), 2487 deletions(-)
 create mode 100644 keystone/content/admin/OS-KSADM-admin.wadl
 create mode 100644 keystone/content/admin/OS-KSCATALOG-admin.wadl
 delete mode 100644 keystone/content/admin/RAX-KSKEY-admin.wadl
 delete mode 100644 keystone/content/admin/identity-admin-OS-KSADM.wadl
 delete mode 100644 keystone/content/admin/identity-admin-RAX-KSADM.wadl
 create mode 100644 keystone/content/common/xsd/OS-KSCATALOG-endpointtemplates.xsd
 delete mode 100644 keystone/content/common/xsd/RAX-KSADM-groups.xsd

diff --git a/keystone/content/admin/OS-KSADM-admin.wadl b/keystone/content/admin/OS-KSADM-admin.wadl
new file mode 100644
index 00000000..bcfc07cf
--- /dev/null
+++ b/keystone/content/admin/OS-KSADM-admin.wadl
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--*******************************************************-->
+<!--         Import Common XML Entities                    -->
+<!--                                                       -->
+<!--     You can resolve the entites with xmllint          -->
+<!--                                                       -->
+<!--        xmllint -noent identity-admin.wadl             -->
+<!--*******************************************************-->
+<!DOCTYPE application [
+    <!ENTITY % common  SYSTEM "../common/common.ent">
+    %common;
+]>
+
+<application xmlns="http://wadl.dev.java.net/2009/02"
+	xmlns:identity="http://docs.openstack.org/identity/api/v2.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 ../common/xsd/api.xsd
+		http://docs.openstack.org/common/api/v1.0 ../common/xsd/api-common.xsd
+		http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd
+		">
+
+    <grammars>
+        <include href="../common/xsd/api.xsd"/>
+        <include href="../common/xsd/api-common.xsd"/>
+    </grammars>
+    <!--*******************************************************-->
+    <!--             All Resoruces                             -->
+    <!--*******************************************************-->
+
+    <!-- We should use SSL in production -->
+    <resources base="http://localhost:5001">
+        <resource id="version" path="v2.0">
+        	<method href="#getVersionInfo"/>
+
+            <resource id="extensions" path="extensions">
+		        <method href="#listExtensions"/>
+
+                <resource id="extension" path="{alias}">
+                    <param name="alias" style="template" type="xsd:string"/>
+                    <method href="#getExtension"/>
+                </resource>
+            </resource>
+
+            <resource id="tokens" path="tokens">
+                <method href="#authenticate"/>
+                <resource id="tokenById" path="{tokenId}">
+		    <param name="X-Auth-Token" style="header" type="xsd:string" required="true">
+			<doc>You need a valid admin token for access.</doc>
+		    </param>                
+                    <param name="tokenId" style="template" type="xsd:string" required="true"/>
+                    <param name="belongsTo" style="query" type="xsd:string" required="false"/>
+                    <method href="#validateToken"/>
+                    <method href="#checkToken"/>
+                    <resource id="endpointsForToken" path="endpoints">
+                        <method href="#listEndpointsForToken"/>
+                    </resource>
+                </resource>
+            </resource>
+
+            <resource id="users" path="users">
+                <param name="X-Auth-Token" style="header" type="xsd:string" required="true">
+                    <doc>You need a valid admin token for access.</doc>
+                </param>                
+                <method href="#getUserByName"/>
+                <resource id="userid" path="{user_id}">
+                    <param name="user_id" style="template" type="xsd:string" required="true"/>
+                    <method href="#getUserById"/>
+
+                    <resource id="userRoles" path="roles">
+                        <method href="#listUserGlobalRoles"/>
+                    </resource>
+                </resource>
+            </resource>
+
+            <resource id="tenants" path="tenants">
+		<method href="#listTenants"/>
+                <method href="#getTenantByName">
+		    <param name="X-Auth-Token" style="header" type="xsd:string" required="true">
+		       <doc>You need a valid admin token for access.</doc>
+		   </param>
+		</method>
+                <resource id="tenantById" path="{tenantId}">
+		    <param name="X-Auth-Token" style="header" type="xsd:string" required="true">
+		       <doc>You need a valid admin token for access.</doc>
+		   </param>
+                    <param name="tenantId" style="template" type="xsd:string"/>
+                    <method href="#getTenantById"/>
+                    <resource id="usersForTenant" path="users">
+                        <resource id="getTenantUser" path="{user_id}">
+                            <param name="user_id" style="template" type="xsd:string"/>
+
+                            <resource id="userRolesForTenant" path="roles">
+                                <method href="#listRolesForUserOnTenant"/>
+                             </resource>
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+
+    <!--*******************************************************-->
+    <!--               All Methods                             -->
+    <!--*******************************************************-->
+
+    <!-- Version -->
+
+    <method name="GET" id="getVersionInfo">
+        <doc xml:lang="EN" title="Version Details">
+            <p xmlns="http://www.w3.org/1999/xhtml">
+            	Returns detailed information about this specific version of the API.
+            </p>
+        </doc>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="capi:version">
+                <param name="location" style="plain" type="xsd:anyURI" required="true" path="/capi:version/atom:link[@rel='self']/@href">
+                    <link resource_type="#VersionDetails" rel="self"/>
+                </param>
+            </representation>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+
+    <!-- Extensions -->
+
+    <method name="GET" id="listExtensions">
+        <doc xml:lang="EN" title="List Extensions">
+            <p xmlns="http://www.w3.org/1999/xhtml">
+            	Lists supported extensions.
+            </p>
+        </doc>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="capi:extensions">
+                <param name="next" style="plain" type="xsd:anyURI" path="/capi:extensions/atom:link[@rel='next']/@href">
+                    <link resource_type="#ExtensionList" rel="next"/>
+                </param>
+                <param name="previous" style="plain" type="xsd:anyURI" path="/capi:extensions/atom:link[@rel='previous']/@href">
+                    <link resource_type="#ExtensionList" rel="previous"/>
+                </param>
+            </representation>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+    </method>
+    <method name="GET" id="getExtension">
+        <doc xml:lang="EN" title="Get Server Details">
+            <p xmlns="http://www.w3.org/1999/xhtml">
+            	Gets details about a specific extension.
+            </p>
+        </doc>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="capi:extension"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+
+    <!-- Token Operations -->
+
+    <method name="POST" id="authenticate">
+        <doc xml:lang="EN" title="Authenticate for Service API">
+            <p xmlns="http://www.w3.org/1999/xhtml" class="shortdesc">
+	      Authenticate to generate a token.
+            </p>
+            <p xmlns="http://www.w3.org/1999/xhtml">
+	      This call will return a token if successful. Each ReST request against other services (or other
+	      calls on Keystone such as the GET /tenants call)
+	      requires the inclusion of a specific authorization token HTTP x-header, defined as X-Auth-Token.
+	      Clients obtain
+	      this token, along with the URL to other service APIs, by first authenticating against the
+	      Keystone Service and supplying valid credentials.
+            </p>
+	    <p xmlns="http://www.w3.org/1999/xhtml">
+	      Client authentication is provided via a ReST interface using the POST method,
+	      with v2.0/tokens supplied as the path. A payload of credentials must be included
+	      in the body.
+	    </p>
+	    <p xmlns="http://www.w3.org/1999/xhtml">
+	      The Keystone Service is a ReSTful web service. It is the entry point to all service APIs.
+	      To access the Keystone Service, you must know URL of the Keystone service.
+	    </p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Auth Request">
+                <example href="../common/samples/auth_credentials.xml" language="xml"/>
+                <example href="../common/samples/auth_credentials.json" language="javascript"/>
+	    </examples>
+            <examples xmlns="http://docs.rackspace.com/api" title="Auth Response">
+                <example href="../common/samples/auth.xml" language="xml"/>
+                <example href="../common/samples/auth.json" language="javascript"/>
+            </examples>
+        </doc>
+        <request>
+            <representation mediaType="application/xml" element="identity:auth"/>
+            <representation mediaType="application/json"/>
+        </request>
+        <response status="200 203">
+            <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="Validate Token">
+            <p xmlns="http://www.w3.org/1999/xhtml" class="shortdesc">
+                Check that a token is valid and that it belongs to a particular user
+                and return the permissions relevant to a particular client.
+            </p>
+            <p xmlns="http://www.w3.org/1999/xhtml">
+                Valid tokens will exist in the
+                <code>/tokens/{tokenId}</code> path and invalid
+                tokens will not.  In other words, a user should expect an
+                itemNotFound (<code>404</code>) fault for an
+                invalid token.
+            </p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Validate Token Response">
+                <example href="../common/samples/validatetoken.xml" language="xml"/>
+                <example href="../common/samples/validatetoken.json" language="javascript"/>
+            </examples>
+        </doc>
+        <request>
+            <param name="belongsTo" style="query" required="false" type="xsd:string">
+                <doc xml:lang="EN">
+                    <p xmlns="http://www.w3.org/1999/xhtml">
+                        Validates a token has the supplied tenant in scope.
+                    </p>
+                </doc>
+            </param>
+        </request>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:auth"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    <method name="HEAD" id="checkToken">
+        <doc xml:lang="EN" title="Check Token">
+            <p xmlns="http://www.w3.org/1999/xhtml" class="shortdesc">
+                Check that a token is valid and that it belongs to a particular user
+                (For perfromance).
+            </p>
+        </doc>
+        <request>
+            <param name="belongsTo" style="query" required="false" type="xsd:string">
+                <doc xml:lang="EN">
+                    <p xmlns="http://www.w3.org/1999/xhtml">
+                        Validates a token has the supplied tenant in scope. (for performance).
+                    </p>
+                    <p xmlns="http://www.w3.org/1999/xhtml">
+                        Valid tokens will exist in the
+                        <code>/tokens/{tokenId}</code> path and invalid
+                        tokens will not.  In other words, a user should expect an
+                        itemNotFound (<code>404</code>) fault for an
+                        invalid token.
+                    </p>
+                    <p xmlns="http://www.w3.org/1999/xhtml">
+                        If `belongsTo` is provided, validates that a token has a specific tenant in scope.
+                    </p>
+                    <p xmlns="http://www.w3.org/1999/xhtml">
+                        No response body is returned for this method.
+                    </p>
+                </doc>
+            </param>
+        </request>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:auth"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+
+    <!--User Operations-->
+    <method name="GET" id="getUserByName">
+        <doc xml:lang="EN" title="Get a User by Name">
+            <p xmlns="http://www.w3.org/1999/xhtml">
+            	Returns detailed information about a specific user, by user name.
+            </p>
+            <examples xmlns="http://docs.rackspace.com/api" title="User Response">
+                <example href="../common/samples/user.xml" language="xml"/>
+                <example href="../common/samples/user.json" language="javascript"/>
+            </examples>
+        </doc>
+        <request>
+            <param name="name" style="query" type="xsd:string" required="true"/>
+        </request>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:user"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    <method name="GET" id="getUserById">
+        <doc xml:lang="EN" title="Get a User by ID">
+            <p xmlns="http://www.w3.org/1999/xhtml">
+            	Returns detailed information about a specific user, by user id.
+            </p>
+            <examples xmlns="http://docs.rackspace.com/api" title="User Response">
+                <example href="../common/samples/user.xml" language="xml"/>
+                <example href="../common/samples/user.json" language="javascript"/>
+            </examples>
+        </doc>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:user"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    <method name="GET" id="listUserGlobalRoles">
+        <doc xml:lang="EN" title="List User Global Roles">
+            <p xmlns="http://www.w3.org/1999/xhtml" class="shortdesc">
+            	Returns global roles for a specific user (excludes tenant roles).
+            	</p>            
+            <p xmlns="http://www.w3.org/1999/xhtml">Returns a list of global roles associated with a specific
+            	    user (excludes tenant roles).</p>
+            <examples xmlns="http://docs.rackspace.com/api" title="User Response">
+                <example href="../common/samples/roles.xml" language="xml"/>
+                <example href="../common/samples/roles.json" language="javascript"/>
+            </examples>
+        </doc>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:roles"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+
+    <!-- Tenant Operations -->
+
+    <method name="GET" id="listTenants">
+        <doc xml:lang="EN" title="Get Tenants">
+            <p xmlns="http://www.w3.org/1999/xhtml" class="shortdesc">
+            	Get a list of tenants.
+            </p>
+            <p xmlns="http://www.w3.org/1999/xhtml">
+	      The operation returns a list of tenants which the supplied token provides
+	      access to. This call must be authenticated, so a valid token must
+	      be passed in as a header. 
+            </p>
+	    <examples xmlns="http://docs.rackspace.com/api" title="Tenants Request with Auth Token">
+	      <example href="../common/samples/tenants-request.txt" language="text"/>
+	    </examples>
+        <examples xmlns="http://docs.rackspace.com/api" title="Tenants Response">
+	      <example href="../common/samples/tenants.xml" language="xml"/>
+	      <example href="../common/samples/tenants.json" language="javascript"/>
+	    </examples>
+        </doc>
+        <request>
+            <param name="marker" style="query" required="false" type="xsd:string"/>
+            <param name="limit" style="query" required="false" type="xsd:int"/>
+        </request>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:tenants"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    <method name="GET" id="getTenantByName">
+        <doc xml:lang="EN" title="Get tenants by name">
+            <p xmlns="http://www.w3.org/1999/xhtml" class="shortdesc">
+            	Returns detailed information about a tenant, by name.
+            </p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Tenant Response">
+                <example href="../common/samples/tenant.xml" language="xml"/>
+                <example href="../common/samples/tenant.json" language="javascript"/>
+            </examples>
+        </doc>
+        <request>
+            <param name="name" style="query" type="xsd:string" required="true"/>
+        </request>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:tenant"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    <method name="GET" id="getTenantById">
+        <doc xml:lang="EN" title="Get Tenants by ID">
+            <p xmlns="http://www.w3.org/1999/xhtml" class="shortdesc">
+            	Returns detailed information about a tenant, by id.
+            </p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Tenant Response">
+                <example href="../common/samples/tenant.xml" language="xml"/>
+                <example href="../common/samples/tenant.json" language="javascript"/>
+            </examples>
+        </doc>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:tenant"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    <method name="GET" id="listEndpointsForToken">
+        <doc xml:lang="EN" title="List Endoints for a Token">
+            <p xmlns="http://www.w3.org/1999/xhtml">
+            	Returns a list of endpoints associated with a specific token.
+            </p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Tenant Endpoint Response">
+                <example href="../common/samples/endpoints.xml" language="xml"/>
+                <example href="../common/samples/endpoints.json" language="javascript"/>
+            </examples>
+        </doc>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:endpoints"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    
+    <method name="GET" id="listRolesForUserOnTenant">
+        <doc xml:lang="EN" title="List Roles for User on Tenant">
+            <p xmlns="http://www.w3.org/1999/xhtml">
+                Returns roles for a specific user on a specific tenant (excludes global roles).
+            </p>
+            <examples xmlns="http://docs.rackspace.com/api" title="Tenant Roles Response">
+                <example href="../common/samples/roles.xml" language="xml"/>
+                <example href="../common/samples/roles.json" language="javascript"/>
+            </examples>
+        </doc>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:roles"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+</application>
diff --git a/keystone/content/admin/OS-KSCATALOG-admin.wadl b/keystone/content/admin/OS-KSCATALOG-admin.wadl
new file mode 100644
index 00000000..0217fb08
--- /dev/null
+++ b/keystone/content/admin/OS-KSCATALOG-admin.wadl
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!--*******************************************************-->
+<!--         Import Common XML Entities                    -->
+<!--                                                       -->
+<!--     You can resolve the entites with xmllint          -->
+<!--                                                       -->
+<!--        xmllint -noent OS-KSCATALOG-admin.wadl         -->
+<!--*******************************************************-->
+<!DOCTYPE application [
+<!ENTITY % common  SYSTEM "../common/common.ent">
+%common;
+]>
+
+<application xmlns="http://wadl.dev.java.net/2009/02"
+	xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
+	xmlns:OS-KSCATALOG="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/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 ../common/xsd/api.xsd
+		http://docs.openstack.org/common/api/v1.0 ../common/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-KSCATALOG/v1.0 ../common/xsd/OS-KSCATALOG-endpointtemplates.xsd
+		">
+
+    <grammars>
+        <include href="../common/xsd/api.xsd"/>
+        <include href="../common/xsd/api-common.xsd"/>
+    </grammars>
+    <!--*******************************************************-->
+    <!--             All Resoruces                             -->
+    <!--*******************************************************-->
+
+    <!-- We should use SSL in production -->
+    <resources base="http://localhost:5001">
+        <resource id="version" path="v2.0">
+
+            <resource id="tenants" path="tenants">
+                <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
+                <resource id="tenantId" path="{tenantId}">
+                    <param name="tenantId" style="template" type="xsd:string"/>
+                    <resource id="endpoints-OS-KSCATALOG" path="OS-KSCATALOG">                    
+                        <resource id="endpoints" path="endpoints">
+                            <method href="#getEndpoints"/>
+                            <method href="#addEndpoint"/>
+                            <resource id="endpoint" path="{endpointId}">
+                                <param name="endpointId" style="template" type="xsd:string"/>
+                                <method href="#getEndpoint"/>
+                                <method href="#deleteEndpoint"/>
+                            </resource>
+                        </resource>
+                     </resource>
+                </resource>    
+            </resource>
+            
+            <resource id="role-service-OS-KSCATALOG" path="OS-KSCATALOG">
+                <resource id="endpointTemplates" path="endpointTemplates">
+                    <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
+                    <method href="#listEndpointTemplates"/>
+                    <method href="#addEndpointTemplate"/>
+                    <resource id="endpointTemplateId" path="{endpointTemplateId}">
+                        <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
+                        <param name="endpointTemplateId" style="template" type="xsd:int"/>
+                        <method href="#getEndpointTemplate"/>
+                        <method href="#deleteEndpointTemplate"/>
+                    </resource>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+
+    <!--*******************************************************-->
+    <!--               All Methods                             -->
+    <!--*******************************************************-->
+
+    <!-- EndPoint Templates -->
+    
+    <method name="GET" id="listEndpointTemplates">
+        <request>
+            <param name="serviceId" style="query" required="false" type="xsd:string"/>
+        </request>
+        <response status="200 203">
+            <representation mediaType="application/xml" element="OS-KSCATALOG:endpointTemplates"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    
+    <method name="GET" id="getEndpointTemplate">
+        <response status="200 203">
+            <representation mediaType="application/xml" element="OS-KSCATALOG:endpointTemplate"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    
+    <method name="POST" id="addEndpointTemplate">
+        <request>
+            <representation mediaType="application/xml" element="OS-KSCATALOG:endpointTemplate"/>
+            <representation mediaType="application/json"/>
+        </request>
+        <response status="201">
+            <representation mediaType="application/xml" element="OS-KSCATALOG:endpointTemplate">
+                <param name="Location" type="xsd:anyURI" style="header"/>
+            </representation>
+            <representation mediaType="application/json">
+                <param name="Location" type="xsd:anyURI" style="header"/>
+            </representation>
+        </response>
+        &commonFaults;
+        &getFaults;
+        &postPutFaults;
+    </method>
+    
+    <method name="DELETE" id="deleteEndpointTemplate">
+        <response status="204"/>
+        &commonFaults;
+        &getFaults;
+    </method>
+    
+    <method name="POST" id="addEndpoint">
+        <request>
+            <representation mediaType="application/xml" element="identity:endpoint"/>
+            <representation mediaType="application/json"/>
+        </request>
+        <response status="201">
+            <representation mediaType="application/xml" element="identity:endpoint">
+                <param name="Location" type="xsd:anyURI" style="header"/>
+            </representation>
+            <representation mediaType="application/json">
+                <param name="Location" type="xsd:anyURI" style="header"/>
+            </representation>
+        </response>
+        &commonFaults;
+        &getFaults;
+        &postPutFaults;
+    </method>
+    
+    <method name="GET" id="getEndpoints">
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:endpoints"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    
+    <method name="GET" id="getEndpoint">
+        <response status="200 203">
+            <representation mediaType="application/xml" element="identity:endpoint"/>
+            <representation mediaType="application/json"/>
+        </response>
+        &commonFaults;
+        &getFaults;
+    </method>
+    
+    <method name="DELETE" id="deleteEndpoint">
+        <response status="204"/>
+        &commonFaults;
+        &getFaults;
+    </method>
+</application>
diff --git a/keystone/content/admin/RAX-KSKEY-admin.wadl b/keystone/content/admin/RAX-KSKEY-admin.wadl
deleted file mode 100644
index 339db5d8..00000000
--- a/keystone/content/admin/RAX-KSKEY-admin.wadl
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--*******************************************************-->
-<!--         Import Common XML Entities                    -->
-<!--                                                       -->
-<!--     You can resolve the entites with xmllint          -->
-<!--                                                       -->
-<!--        xmllint -noent identity-admin.wadl             -->
-<!--*******************************************************-->
-<!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "../common/common.ent">
-    %common;
-]>
-
-<application xmlns="http://wadl.dev.java.net/2009/02"
-	xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
-	xmlns:capi="http://docs.openstack.org/common/api/v2.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:RAX-KSKEY ="http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0"
-	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.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0 ../service/xsd/RAX-KSKEY-credentials.xsd
-		">
-
-    <grammars>
-        <include href="xsd/api.xsd"/>
-        <include href="xsd/api-common.xsd"/>
-    </grammars>
-    <!--*******************************************************-->
-    <!--             All Resoruces                             -->
-    <!--*******************************************************-->
-
-    <!-- We should use SSL in production -->
-    <resources base="http://localhost:5001">
-        <resource id="users" path="users">
-            <resource id="userid" path="{user_id}">
-                <param name="user_id" style="template" type="xsd:string" required="true"/>
-                <resource id="userCredentials" path="credentials">
-                    <resource id="RAX-KSKEY-admin-extension" path="RAX-KSKEY-admin">
-                        <resource id="apikeyCredentials" path="apikeyCredentials">
-                            <method href="#addAPIkeyCredentials"/>
-                            <method href="#getAllAPIkeyCredentials"/>
-			    <resource id="credentialTypeAndId" path="{credential_type_and_id}">
-				<param name="credential_type_and_id" style="template" type="xsd:string" required="true"/>
-			    </resource>
-                            <resource id="apikeyCredentialsId" path="{apikeyCredentialsId}">
-                                <param name="apikeyCredentialsId" style="template" type="xsd:string" required="true"/>
-                                <method href="#getAPIkeyCredentialsById"/>    
-                            </resource>
-                       </resource>
-                    </resource>
-                </resource>
-            </resource>
-        </resource>
-    </resources>
-    
-    
-
-    <!--*******************************************************-->
-    <!--               All Methods                             -->
-    <!--*******************************************************-->
-
-    <method name="POST" id="addAPIkeyCredentials">
-        <doc xml:lang="EN" title="/tokens">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-                Adds a valid apikeyCredentials.
-            </p>
-        </doc>
-        <request>
-            <representation mediaType="application/xml" element="RAX-KSKEY:apikeyCredentials"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="RAX-KSKEY:apikeyCredentials"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:userDisabled"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &postPutFaults;
-    </method>
-
-
-    <method name="GET" id="getAPIkeyCredentialsByRegion">
-        <doc xml:lang="EN" title="/tokens/{token_id}">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-            	Retrieves a token.
-            </p>
-            <p xmlns="http://www.w3.org/1999/xhtml">
-        		Returns token expiration, user info, and the user's roles for the given token.
-			</p>
-        </doc>
-        <request>
-            <param name="belongsTo" style="query" required="false" type="xsd:string">
-                <doc xml:lang="EN" title="/tokens/{token_id}?belongsTo={tenant_id}">
-                    <p xmlns="http://www.w3.org/1999/xhtml">
-                        Validates a token has the supplied tenant in scope.
-                    </p>
-                </doc>
-            </param>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:auth"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="HEAD" id="checkToken">
-        <doc xml:lang="EN" title="/tokens/{token_id}">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-            	Validates a token exists (for performance).
-            </p>
-        </doc>
-        <request>
-            <param name="belongsTo" style="query" required="false" type="xsd:string">
-                <doc xml:lang="EN" title="/tokens/{token_id}?belongsTo={tenant_id}">
-                    <p xmlns="http://www.w3.org/1999/xhtml">
-                        Validates a token has the supplied tenant in scope. (for performance).
-                    </p>
-                    <p xmlns="http://www.w3.org/1999/xhtml">
-                        If `belongsTo` is provided, validates that a token has a specific tenant in scope.
-                    </p>
-                </doc>
-            </param>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:auth"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-
-    <!--User Operations-->
-    <method name="GET" id="getUserByName">
-        <doc xml:lang="EN" title="/users/?username={user_name}">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-            	Returns detailed information about a specific user, by user name.
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:user"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getUserById">
-        <doc xml:lang="EN" title="/users/{user_id}">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-            	Returns detailed information about a specific user, by user id.
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:user"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="listUserGlobalRoles">
-        <doc xml:lang="EN" title="/users/{user_id}/roles">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-            	Returns global roles for a specific user (excludes tenant roles).
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:roles"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-
-    <!-- Tenant Operations -->
-
-    <method name="GET" id="listTenants">
-        <doc xml:lang="EN" title="/tenants">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-            	Returns a list of all tenants.
-            </p>
-        </doc>
-        <request>
-            <param name="marker" style="query" required="false" type="xsd:string"/>
-            <param name="limit" style="query" required="false" type="xsd:int"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:tenants"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getTenantByName">
-        <doc xml:lang="EN" title="/tenants/?name={tenant_name}">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-            	Returns detailed information about a tenant, by name.
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getTenantById">
-        <doc xml:lang="EN" title="/tenants/{tenant_id}">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-            	Returns detailed information about a tenant, by id.
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="listEndpointsForToken">
-        <doc xml:lang="EN" title="/tokens/{token_id}/endpoints">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-            	Returns a list of endpoints associated with a specific token.
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:endpoints"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    
-    <method name="GET" id="listRolesForUserOnTenant">
-        <doc xml:lang="EN" title="/tenants/{tenant_id}/users/{user_id}/roles">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-                Returns roles for a specific user on a specific tenant (excludes global roles).
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:roles"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-</application>
diff --git a/keystone/content/admin/identity-admin-OS-KSADM.wadl b/keystone/content/admin/identity-admin-OS-KSADM.wadl
deleted file mode 100644
index 7d74013b..00000000
--- a/keystone/content/admin/identity-admin-OS-KSADM.wadl
+++ /dev/null
@@ -1,640 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
-<!--*******************************************************-->
-<!--         Import Common XML Entities                    -->
-<!--                                                       -->
-<!--     You can resolve the entites with xmllint          -->
-<!--                                                       -->
-<!--        xmllint -noent identity-admin.wadl             -->
-<!--*******************************************************-->
-<!DOCTYPE application [
-<!ENTITY % common  SYSTEM "../common/common.ent">
-%common;
-]>
-
-<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 ../common/xsd/api.xsd
-		http://docs.openstack.org/common/api/v1.0 ../common/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 ../common/xsd/OS-KSADM-endpointtemplates.xsd
-		">
-
-    <grammars>
-        <include href="xsd/api.xsd"/>
-        <include href="xsd/api-common.xsd"/>
-    </grammars>
-    <!--*******************************************************-->
-    <!--             All Resoruces                             -->
-    <!--*******************************************************-->
-
-    <!-- We should use SSL in production -->
-    <resources base="http://localhost:5001">
-        <resource id="version" path="v2.0">
-        	<method href="#getVersionInfo"/>
-
-            <resource id="extensions" path="extensions">
-		        <method href="#listExtensions"/>
-
-                <resource id="extension" path="OS-KSADM">
-                    <method href="#getExtension"/>
-                </resource>
-            </resource>
-
-            <resource id="tokens" path="tokens">
-                <method href="#authenticate"/>
-
-                <resource id="tokenById" path="{tokenId}">
-                    <param name="tokenById" style="template" type="xsd:string"/>
-                    <method href="#validateToken"/>
-                    <method href="#revokeToken"/>
-                </resource>
-            </resource>
-
-            <resource id="tenants" path="tenants">
-				<method href="#listTenants"/>
-				<method href="#addTenant"/>
-				
-                <resource id="tenantById" path="{tenantId}">
-                    <param name="tenantId" style="template" type="xsd:string"/>
-                    <method href="#getTenant"/>
-
-                    <resource id="endpointsForTenant" path="endpoints">
-                        <method href="#listEndpointsForTenant"/>
-                        <method href="#addEndpointForTenant"/>
-
-                        <resource id="endpointForTenantById" path="{endpointId}">
-                            <param name="endpointId" style="template" type="xsd:int"/>
-                            <method href="#getEndpointForTenant"/>
-                            <method href="#deleteEndpointForTenant"/>
-                        </resource>
-                    </resource>
-
-                    <resource id="rolesForTenant" path="roles">
-                        <method href="#listRolesForTenant"/>
-
-                        <resource id="roleForTenantById" path="{roleId}">
-                            <param name="roleId" style="template" type="xsd:string"/>
-                            <method href="#getRoleForTenant"/>
-
-                            <resource id="usersWithRoleForTenant" path="users">
-                                <method href="#addUsersWithRoleForTenant"/>
-
-                                <resource id="userWithRoleForTenant" path="{username}">
-                                    <param name="username" style="template" type="xsd:string"/>
-                                    <method href="#addUserWithRoleForTenant"/>
-                                </resource>
-                            </resource>
-                        </resource>
-                    </resource>
-
-                    <resource id="usersForTenant" path="users">
-                        <param name="role" style="query" type="xsd:string" required="false"/>
-                        <method href="#listUsersWithRoleForTenant"/>
-
-                        <resource id="userForTenant" path="{username}">
-                            <param name="username" style="template" type="xsd:string"/>
-
-                            <resource id="userRolesForTenant" path="roles">
-                                <resource id="role" path="{roleId}">
-                                    <method href="#addRolesToUserOnTenant"/>
-                                    <method href="#deleteRoleFromUserOnTenant"/>
-                                </resource>
-                            </resource>
-
-                            <resource id="userRoleForTenant" path="role">
-                                <method href="#addRoleToUserOnTenant"/>
-                            </resource>
-                        </resource>
-                    </resource>
-                </resource>
-            </resource>
-
-            <resource id="users" path="users">
-                <param name="username" style="query" type="xsd:string" required="false"/>
-                <method href="#addUser"/>
-
-                <resource id="username" path="{username}">
-                    <param name="username" style="template" type="xsd:string"/>
-                    <method href="#getUser"/>
-                    <method href="#updateUser"/>
-
-                    <resource id="userRoles" path="roles">
-                        <method href="#listUserRoles"/>
-
-                        <resource id="userRoleById" path="{roleId}">
-                            <param name="roleId" style="template" type="xsd:int"/>
-                            <method href="#addUserRole"/>
-                            <method href="#getUserRole"/>
-                            <method href="#deleteUserRole"/>
-                        </resource>
-                    </resource>
-
-                    <resource id="userCredentials" path="credentials">
-
-                        <resource id="userCredentialsByType" path="{credentialType}">
-                            <param name="credentialType" style="template" type="xsd:string"/>
-                            <method href="#addCredentialByType"/>
-                            <method href="#getCredentialByType"/>
-
-                            <resource id="userCredentialById" path="{credentialId}">
-                                <param name="credentialId" style="template" type="xsd:string"/>
-                                <method href="#getUserCredential"/>
-                            </resource>
-                        </resource>
-                    </resource>
-                </resource>
-            </resource>
-
-            <resource id="endpointTemplates" path="endpointTemplates">
-                <method href="#listEndpointTemplates"/>
-                <method href="#addEndpointTemplate"/>
-
-                <resource id="endpointTemplateId" path="{endpointTemplateId}">
-                    <param name="endpointTemplateId" style="template" type="xsd:int"/>
-                    <method href="#getEndpointTemplate"/>
-                    <method href="#deleteEndpointTemplate"/>
-                </resource>
-            </resource>
-
-            <resource id="roles" path="roles">
-                <method href="#listRoles"/>
-
-                <resource id="roleId" path="{roleId}">
-                    <param name="roleId" style="template" type="xsd:int"/>
-                    <method href="#getRole"/>
-                </resource>
-            </resource>
-
-            <resource id="services" path="services">
-                <method href="#listServices"/>
-                <method href="#addService"/>
-
-                <resource id="serviceId" path="{serviceId}">
-                    <param name="serviceId" style="template" type="xsd:int"/>
-                    <method href="#getService"/>
-                    <method href="#deleteService"/>
-                </resource>
-            </resource>
-        </resource>
-    </resources>
-
-    <!--*******************************************************-->
-    <!--               All Methods                             -->
-    <!--*******************************************************-->
-
-    <!-- Version -->
-
-    <method name="GET" id="getVersionInfo">
-        <doc xml:lang="EN" title="Version Details">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-            	Returns detailed information about this specific version of the API.
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="capi:version">
-                <param name="location" style="plain" type="xsd:anyURI" required="true" path="/capi:version/atom:link[@rel='self']/@href">
-                    <link resource_type="#VersionDetails" rel="self"/>
-                </param>
-            </representation>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-
-    <!-- Extensions -->
-
-    <method name="GET" id="listExtensions">
-        <doc xml:lang="EN" title="List Extensions">
-            <p xmlns="http://www.w3.org/1999/xhtml">Lists supported extensions.</p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="capi:extensions">
-                <param name="next" style="plain" type="xsd:anyURI" path="/capi:extensions/atom:link[@rel='next']/@href">
-                    <link resource_type="#ExtensionList" rel="next"/>
-                </param>
-                <param name="previous" style="plain" type="xsd:anyURI" path="/capi:extensions/atom:link[@rel='previous']/@href">
-                    <link resource_type="#ExtensionList" rel="previous"/>
-                </param>
-            </representation>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-    </method>
-    <method name="GET" id="getExtension">
-        <doc xml:lang="EN" title="Get Server Details">
-            <p xmlns="http://www.w3.org/1999/xhtml">Gets details about a specific extension.</p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="capi:extension"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-
-    <!-- Token Operations -->
-
-    <method name="POST" id="authenticate">
-        <doc xml:lang="EN" title="Authenticate">
-            <p xmlns="http://www.w3.org/1999/xhtml">Authenticates you with the service.</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/json"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:authenticateResponse"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-    </method>
-    <method name="GET" id="validateToken">
-        <doc xml:lang="EN" title="Validate Token">
-            <p xmlns="http://www.w3.org/1999/xhtml">Validates a service or admin token.</p>
-        </doc>
-        <request>
-            <param name="belongsTo" style="query" required="false" type="xsd:string"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:auth"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="DELETE" id="revokeToken">
-        <doc xml:lang="EN" title="Revoke Token">
-            <p xmlns="http://www.w3.org/1999/xhtml">Invalidates an issued token.</p>
-        </doc>
-        <response status="204"/>
-        &commonFaults;
-        &getFaults;
-    </method>
-
-    <!-- Tenant Operations -->
-
-    <method name="GET" id="listTenants">
-        <doc xml:lang="EN" title="Validate Token">
-            <p xmlns="http://www.w3.org/1999/xhtml">Lists all tenants.</p>
-        </doc>
-        <request>
-            <param name="marker" style="query" required="false" type="xsd:string"/>
-            <param name="limit" style="query" required="false" type="xsd:int"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:tenants"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getTenant">
-        <doc xml:lang="EN" title="Tenant Details">
-            <p xmlns="http://www.w3.org/1999/xhtml">Gets details about a specific tenant.</p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="PUT" id="addTenant">
-        <doc xml:lang="EN" title="Create Tenant">
-            <p xmlns="http://www.w3.org/1999/xhtml">Creates a tenant.</p>
-        </doc>
-        <request>
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-    </method>
-    <method name="PUT" id="updateTenant">
-        <request>
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="DELETE" id="deleteTenant">
-        <response status="204"/>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <!--User Operations-->
-
-    <method name="GET" id="getUsers">
-        <request>
-            <param name="marker" style="query" required="false" type="xsd:string"/>
-            <param name="limit" style="query" required="false" type="xsd:int"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:users"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="PUT" id="createUser">
-        <request>
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getUser">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:user"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="HEAD" id="checkUser">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:user"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="PUT" id="updateUser">
-        <request>
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="DELETE" id="deleteUser">
-        <response status="204"/>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="PUT" id="setUserEnabled">
-        <request>
-            <representation mediaType="application/xml" element="identity:user">
-                <param name="user" style="plain" path="/" type="identity:UserWithOnlyEnabled"/>
-            </representation>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="PUT" id="setUserPassword">
-        <request>
-            <representation mediaType="application/xml" element="identity:user">
-                <param name="user" style="plain" path="/" type="identity:UserWithOnlyPassword"/>
-            </representation>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="PUT" id="setUserTenant">
-        <request>
-            <representation mediaType="application/xml" element="identity:user">
-                <param name="user" style="plain" path="/" type="identity:UserWithOnlyTenant"/>
-            </representation>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getEndpointTemplates">
-        <request>
-            <param name="serviceName" style="query" required="false" type="xsd:string"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="OS-KSADM:endpointTemplates"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getEndpointTemplate">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:endpointTemplate"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="POST" id="addEndpointTemplate">
-        <request>
-            <representation mediaType="application/xml" element="identity:role"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:role">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-            <representation mediaType="application/json">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="DELETE" id="deleteEndpointTemplate">
-        <response status="204"/>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getEndpoints">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:endpoints"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="POST" id="addEndpoint">
-        <request>
-            <representation mediaType="application/xml" element="identity:endpoint"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:endpoint">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-            <representation mediaType="application/json">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getEndpoint">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:endpoint"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="DELETE" id="deleteEndpoint">
-        <response status="204"/>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <!--Roles-->
-
-    <method name="GET" id="getRoles">
-        <request>
-            <param name="serviceId" style="query" required="false" type="xsd:string"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:roles"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getRole">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:role"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="POST" id="addRole">
-        <request>
-            <representation mediaType="application/xml" element="identity:role"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:role">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-            <representation mediaType="application/json">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="DELETE" id="deleteRole">
-        <response status="204"/>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getRoleRefs">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:roleRefs"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="POST" id="addRoleRef">
-        <request>
-            <representation mediaType="application/xml" element="identity:roleRef"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:roleRef">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-            <representation mediaType="application/json">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getRoleRef">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:roleRef"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="DELETE" id="deleteRoleRef">
-        <response status="204"/>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getServices">
-        <request>
-            <param name="serviceId" style="query" required="false" type="xsd:string"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:services"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="GET" id="getService">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:service"/>
-            <representation mediaType="application/json"/>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="POST" id="addService">
-        <request>
-            <representation mediaType="application/xml" element="identity:service"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:service">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-            <representation mediaType="application/json">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-    <method name="DELETE" id="deleteService">
-        <response status="204"/>
-        &commonFaults;
-        &getFaults;
-    </method>
-</application>
diff --git a/keystone/content/admin/identity-admin-RAX-KSADM.wadl b/keystone/content/admin/identity-admin-RAX-KSADM.wadl
deleted file mode 100644
index 4d39e3b6..00000000
--- a/keystone/content/admin/identity-admin-RAX-KSADM.wadl
+++ /dev/null
@@ -1,1455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (C) 2011 Rackspace Hosting, All Rights Reserved -->
-<!--*******************************************************-->
-<!--         Import Common XML Entities                    -->
-<!--                                                       -->
-<!--     You can resolve the entites with xmllint          -->
-<!--                                                       -->
-<!--        xmllint -noent identity-admin-RAX.wadl         -->
-<!--*******************************************************-->
-<!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "../common/common.ent">
-    %common;
-]>
-
-<application xmlns="http://wadl.dev.java.net/2009/02"
-    xmlns:identity="http://docs.openstack.org/identity/api/v2.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 ../common/xsd/api.xsd
-    http://docs.openstack.org/common/api/v1.0 ../common/xsd/api-common.xsd
-    http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd
-    ">
-
-    <grammars>
-        <include href="../common/xsd/api.xsd"/>
-        <include href="../common/xsd/api-common.xsd"/>
-        <include href="../common/xsd/RAX-KSADM-groups.xsd"/>
-        <include href="../common/xsd/RAX-KSADM-users.xsd"/>        
-        <include href="../common/xsd/RAX-KSADM-credentials.xsd"/>        
-    </grammars>
-
-    <!--*******************************************************-->
-    <!--             All Resoruces                             -->
-    <!--*******************************************************-->
-
-    <!-- We should use SSL in production -->
-    <resources base="http://localhost:5000">
-        <resource id="version" type="#VersionDetails" path="v2.0/">
-            <resource id="extensions" path="extensions">
-                <method href="#listExtensions"/>
-                
-                <resource id="extension" path="RAX-KSADM">
-                    <method href="#getExtension"/>
-                </resource>
-            </resource>
-            
-            <resource id="services" path="services">
-                <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
-                <method href="#listServices"/>
-                <method href="#addService"/>
-                <resource id="serviceId" path="{serviceId}">
-                    <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
-                    <param name="serviceId" style="template" type="xsd:int"/>
-                    <method href="#getService"/>
-                    <method href="#deleteService"/>
-                </resource>
-            </resource>
-            
-            <resource id="endpointTemplates" path="endpointTemplates">
-                <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
-                <method href="#listEndpointTemplates"/>
-                <method href="#addEndpointTemplate"/>
-                <resource id="endpointTemplateId" path="{endpointTemplateId}">
-                    <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
-                    <param name="endpointTemplateId" style="template" type="xsd:int"/>
-                    <method href="#getEndpointTemplate"/>
-                    <method href="#deleteEndpointTemplate"/>
-                </resource>
-            </resource>
-
-            <resource id="roles" path="roles">
-                <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
-                <method href="#listRoles"/>
-                <resource id="roleId" path="{roleId}">
-                    <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
-                    <param name="roleId" style="template" type="xsd:int"/>
-                    <method href="#getRole"/>
-                </resource>
-            </resource>
-
-            <resource id="users" path="users">
-                <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
-                <resource id="userId" path="{userId}">
-                    <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
-                    <param name="userId" style="template" type="xsd:string"/>
-                    <method href="#getUser"/>
-                    <resource id="userRoles" path="roles">
-                        <method href="#listRoles"/>
-                        <resource id="role" path="{roleId}">
-                            <param name="roleId" style="template" type="xsd:int"/>
-                            <method href="#getRole"/>
-                        </resource> 
-                    </resource> 
-                </resource>
-            </resource>
-
-            <resource id="tenants" path="tenants">
-        		<param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
-                <resource id="tenantId" path="{tenantId}">
-                    <param name="tenantId" style="template" type="xsd:string"/>
-                    <method href="#getTenant"/>
-                    <resource id="endpoints" path="endpoints">
-		                <method href="#getEndpoints"/>
-		                <method href="#addEndpoint"/>
-	        	        <resource id="endpoint" path="{endpointId}">
-    	        	        <param name="endpointId" style="template" type="xsd:int"/>
-        	        	    <method href="#getEndpoint"/>
-            	        	<method href="#deleteEndpoint"/>
-	            	    </resource>
-	            	</resource>    
-	            </resource>    
-            </resource>
-
-            <resource id="tokens" path="tokens">
-                <method href="#authenticate"/>
-                <resource id="tokenId" path="{tokenId}">
-                    <param name="X-Auth-Token" style="header" type="xsd:string" required="true">
-                        <doc>
-                            You need an admin token to execute this operation. The token must be valid...
-                        </doc>
-                    </param>
-                    <param name="tokenId" style="template" type="xsd:string"/>
-                    <method href="#validateToken"/>
-                </resource>
-            </resource>
-
-        </resource>
-    </resources>
-
-
-    <!--*******************************************************-->
-    <!--               Resource Types                          -->
-    <!--*******************************************************-->
-
-    <resource_type id="VersionDetails">
-        <method href="#getVersionInfo"/>
-    </resource_type>
-
-    <resource_type id="ExtensionList">
-        <doc xml:lang="EN" title="Extension List">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-                A list of supported extensions.
-            </p>
-        </doc>
-        <method href="#listExtensions"/>
-    </resource_type>
-
-
-
-    <!--*******************************************************-->
-    <!--               All Methods                             -->
-    <!--*******************************************************-->
-
-    <!-- Version -->
-    <method name="GET" id="versionDetails">
-        <doc xml:lang="EN" title="Version Details">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-                Returns detailed information about this specific
-                version of the API.
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="capi:version">
-                <param name="location" style="plain" type="xsd:anyURI" required="true" path="/capi:version/atom:link[@rel='self']/@href">
-                    <link resource_type="#VersionDetails" rel="self"/>
-                </param>
-            </representation>
-            <representation mediaType="application/json"/>
-        </response>
-        <!-- Common Faults -->
-        
-        <response xmlns="http://wadl.dev.java.net/2009/02">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="405">
-            <representation mediaType="application/xml" element="identity:badMethod"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="413">
-            <representation mediaType="application/xml" element="identity:overLimit"/>
-            <representation mediaType="application/json"/>
-        </response>
-           
-    </method>
-		
-    <!-- Extensions -->
-    <method name="GET" id="listExtensions">
-        <doc xml:lang="EN" title="List Extensions">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-                List all available extensions.
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="capi:extensions">
-                <param name="next" style="plain" type="xsd:anyURI" path="/capi:extensions/atom:link[@rel='next']/@href">
-                    <link resource_type="#ExtensionList" rel="next"/>
-                </param>
-                <param name="previous" style="plain" type="xsd:anyURI" path="/capi:extensions/atom:link[@rel='previous']/@href">
-                    <link resource_type="#ExtensionList" rel="previous"/>
-                </param>
-            </representation>
-            <representation mediaType="application/json"/>
-        </response>
-        <!-- Common Faults -->
-        
-        <response xmlns="http://wadl.dev.java.net/2009/02">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="405">
-            <representation mediaType="application/xml" element="identity:badMethod"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="413">
-            <representation mediaType="application/xml" element="identity:overLimit"/>
-            <representation mediaType="application/json"/>
-        </response>
-           
-    </method>
-
-    <method name="GET" id="getExtension">
-        <doc xml:lang="EN" title="Get Server Details">
-            <p xmlns="http://www.w3.org/1999/xhtml">
-                Get details about a specific extension.
-            </p>
-        </doc>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="capi:extension"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <!-- Common and GET Faults-->
-        
-        <response xmlns="http://wadl.dev.java.net/2009/02">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="405">
-            <representation mediaType="application/xml" element="identity:badMethod"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="413">
-            <representation mediaType="application/xml" element="identity:overLimit"/>
-            <representation mediaType="application/json"/>
-        </response>
-           
-        
-        <response xmlns="http://wadl.dev.java.net/2009/02" status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-            <representation mediaType="application/json"/>
-        </response>
-           
-    </method>
-
-
-    <!-- Token Operations -->
-    <method name="POST" id="authenticate">
-        <request>
-            <representation mediaType="application/xml" element="identity:passwordCredentials"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:authenticateResponse"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:userDisabled"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="401 403 400 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="GET" id="validateToken">
-        <request>
-            <param name="belongsTo" style="query" required="false" type="xsd:string"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:auth"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-            <representation mediaType="application/xml" element="identity:userDisabled"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="HEAD" id="checkToken">
-        <request>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:auth"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-            <representation mediaType="application/xml" element="identity:userDisabled"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="DELETE" id="revokeToken">
-        <response status="204"/>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <!-- Tenant Operations -->
-    <method name="GET" id="getTenants">
-        <request>
-            <param name="marker" style="query" required="false" type="xsd:string"/>
-            <param name="limit" style="query" required="false" type="xsd:int"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:tenants"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="PUT" id="createTenant">
-        <request>
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="409">
-            <representation mediaType="application/xml" element="identity:tenantConflict"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="401 403 400 409 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="GET" id="getTenant">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="HEAD" id="checkTenant">
-        <response status="200 203">
-        </response>
-        <response status="401">
-        </response>
-        <response status="403">
-        </response>
-        <response status="400">
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="PUT" id="updateTenant">
-        <request>
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="401 403 404 400 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="DELETE" id="deleteTenant">
-        <response status="204"/>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-    
-    <!--User Operations-->
-    <method name="GET" id="getUsers">
-        <request>
-            <param name="marker" style="query" required="false" type="xsd:string"/>
-            <param name="limit" style="query" required="false" type="xsd:int"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:users"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="PUT" id="createUser">
-        <request>
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="409">
-            <representation mediaType="application/xml" element="identity:tenantConflict"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="401 403 400 409 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="GET" id="getUser">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:user"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="HEAD" id="checkUser">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:user"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="PUT" id="updateUser">
-        <request>
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="401 403 404 400 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="DELETE" id="deleteUser">
-        <response status="204"/>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-    
-    <method name="PUT" id="setUserEnabled">
-        <request>
-            <representation mediaType="application/xml" element="identity:user">
-                <param name="user" style="plain" path="/" type="identity:UserWithOnlyEnabled"/>
-            </representation>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="401 403 404 400 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="PUT" id="setUserPassword">
-        <request>
-            <representation mediaType="application/xml" element="identity:user">
-                <param name="user" style="plain" path="/" type="identity:UserWithOnlyPassword"/>
-            </representation>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="401 403 404 400 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-    
-    <method name="PUT" id="setUserTenant">
-        <request>
-            <representation mediaType="application/xml" element="identity:user">
-                <param name="user" style="plain" path="/" type="identity:UserWithOnlyTenant"/>
-            </representation>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="identity:tenant"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="401 403 404 400 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>    
-
-    <method name="GET" id="getEndpointTemplates">
-        <request>
-            <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/json"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="GET" id="getEndpointTemplate">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:endpointTemplate"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:authFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-    
-    <method name="POST" id="addEndpointTemplate">
-	<request>
-            <representation mediaType="application/xml" element="identity:role"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:role">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-            <representation mediaType="application/json">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-     </method>
-    
-    <method name="DELETE" id="deleteEndpointTemplate">
-        <response status="204"/>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:authFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="GET" id="getEndpoints">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:endpoints"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:authFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="POST" id="addEndpoint">
-        <request>
-            <representation mediaType="application/xml" element="identity:endpoint"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:endpoint">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-            <representation mediaType="application/json">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="GET" id="getEndpoint">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:endpoint"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="DELETE" id="deleteEndpoint">
-        <response status="204"/>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:authFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-    
-	<!--Roles-->
-	<method name="GET" id="getRoles">
-        <request>
-            <param name="serviceId" style="query" required="false" type="xsd:string"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:roles"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="GET" id="getRole">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:role"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:authFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-    
-    <method name="POST" id="addRole">
-	<request>
-            <representation mediaType="application/xml" element="identity:role"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:role">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-            <representation mediaType="application/json">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-     </method>
-    
-    <method name="DELETE" id="deleteRole">
-        <response status="204"/>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:authFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="GET" id="getRoleRefs">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:roleRefs"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:authFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="POST" id="addRoleRef">
-        <request>
-            <representation mediaType="application/xml" element="identity:roleRef"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:roleRef">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-            <representation mediaType="application/json">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="GET" id="getRoleRef">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:roleRef"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="DELETE" id="deleteRoleRef">
-        <response status="204"/>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:authFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-    
-	<method name="GET" id="getServices">
-        <request>
-            <param name="serviceId" style="query" required="false" type="xsd:string"/>
-        </request>
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:services"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-
-    <method name="GET" id="getService">
-        <response status="200 203">
-            <representation mediaType="application/xml" element="identity:service"/>
-            <representation mediaType="application/json"/>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:authFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>
-    
-    <method name="POST" id="addService">
-	<request>
-            <representation mediaType="application/xml" element="identity:service"/>
-            <representation mediaType="application/json"/>
-        </request>
-        <response status="201">
-            <representation mediaType="application/xml" element="identity:service">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-            <representation mediaType="application/json">
-                <param name="Location" type="xsd:anyURI" style="header"/>
-            </representation>
-        </response>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:identityFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-     </method>
-    
-    <method name="DELETE" id="deleteService">
-        <response status="204"/>
-        <response status="400">
-            <representation mediaType="application/xml" element="identity:badRequest"/>
-        </response>
-        <response status="401">
-            <representation mediaType="application/xml" element="identity:unauthorized"/>
-        </response>
-        <response status="403">
-            <representation mediaType="application/xml" element="identity:forbidden"/>
-        </response>
-        <response status="404">
-            <representation mediaType="application/xml" element="identity:itemNotFound"/>
-        </response>
-        <response status="500">
-            <representation mediaType="application/xml" element="identity:authFault"/>
-        </response>
-        <response status="503">
-            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-        </response>
-        <response status="400 401 403 404 500 503">
-            <representation mediaType="application/json"/>
-        </response>
-    </method>    
-</application>
diff --git a/keystone/content/common/xsd/OS-KSCATALOG-endpointtemplates.xsd b/keystone/content/common/xsd/OS-KSCATALOG-endpointtemplates.xsd
new file mode 100644
index 00000000..20afd735
--- /dev/null
+++ b/keystone/content/common/xsd/OS-KSCATALOG-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-KSCATALOG="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/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-KSCATALOG/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-KSCATALOG: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-KSCATALOG: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-KSCATALOG: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/common/xsd/RAX-KSADM-credentials.xsd b/keystone/content/common/xsd/RAX-KSADM-credentials.xsd
index c849afe1..3f9fd126 100644
--- a/keystone/content/common/xsd/RAX-KSADM-credentials.xsd
+++ b/keystone/content/common/xsd/RAX-KSADM-credentials.xsd
@@ -27,7 +27,6 @@
                 <attribute name="APIKey" type="xsd:string" use="required" ></attribute>
             </extension>
         </complexContent>
-        
     </complexType>
     
 </schema>
diff --git a/keystone/content/common/xsd/RAX-KSADM-groups.xsd b/keystone/content/common/xsd/RAX-KSADM-groups.xsd
deleted file mode 100644
index 6f9b1f27..00000000
--- a/keystone/content/common/xsd/RAX-KSADM-groups.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="../xslt/schema.xslt"?>
-
-<schema
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
-    xmlns:RAX-KSADM="http://docs.rackspace.com/identity/api/ext/RAX-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.rackspace.com/identity/api/ext/RAX-KSADM/v1.0"
-    >
-    <!--Import schema we are extending -->
-    <import namespace="http://docs.openstack.org/identity/api/v2.0"
-        schemaLocation="token.xsd"/>
-
-    <!-- Elements -->
-
-    <!-- Complex Types -->
-    <complexType name="RAX-UserForAuthData">
-        <complexContent>
-            <extension base="identity:UserForAuthenticateResponse">
-                <sequence>
-                    <element name="groups" type="RAX-KSADM:Groups" />
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="Groups">
-        <sequence>
-            <element name="group" type="RAX-KSADM:Group" maxOccurs="100"/>
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-        </sequence>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="Group">
-        <attribute name="id" type="xsd:string" use="required"/>
-        <attribute name="tenantId" type="xsd:string"  use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-</schema>
-
diff --git a/keystone/content/common/xsd/credentials.xsd b/keystone/content/common/xsd/credentials.xsd
index fcfc0dae..f873489b 100644
--- a/keystone/content/common/xsd/credentials.xsd
+++ b/keystone/content/common/xsd/credentials.xsd
@@ -12,8 +12,13 @@
     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/v2.0" 
+    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="auth" type="identity:AuthenticationRequest"/>
     <element name="credentials" type="identity:CredentialType"/>
@@ -35,16 +40,16 @@
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>        
     </complexType>
+    
     <complexType name="AuthenticationRequest">
         <sequence>
-            <choice minOccurs="1">
-                <element ref="identity:credentials"/>
-                <any namespace="##other" processContents="lax"/>
-            </choice>
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+           <element ref="identity:credentials" minOccurs="1"/>
+           <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>        
         </sequence>
         <attribute name="tenantId" type="xsd:string" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>                
     </complexType>
+
     <complexType name="PasswordCredentialsBase">
         <complexContent>
             <extension base="identity:CredentialType">
@@ -53,6 +58,7 @@
             </extension>
         </complexContent>
     </complexType>
+
     <complexType name="PasswordCredentialsWithoutUsername">
         <complexContent>
             <restriction base="identity:PasswordCredentialsBase">
@@ -61,6 +67,7 @@
             </restriction>
         </complexContent>
     </complexType>
+
     <complexType name="PasswordCredentialsRequiredUsername">
         <complexContent>
             <restriction base="identity:PasswordCredentialsBase">
@@ -68,5 +75,13 @@
                 <attribute name="password" type="xsd:string" use="required" />
             </restriction>
         </complexContent>
-    </complexType>  
+    </complexType>
+
+    <complexType name="CredentialListType">
+        <sequence>
+            <element ref="identity:credentials" minOccurs="0" maxOccurs="unbounded"/>
+            <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
+        </sequence>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
 </schema>
diff --git a/keystone/content/common/xsd/token.xsd b/keystone/content/common/xsd/token.xsd
index a7ff8d28..01187dfe 100644
--- a/keystone/content/common/xsd/token.xsd
+++ b/keystone/content/common/xsd/token.xsd
@@ -15,6 +15,7 @@
     targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
     <include schemaLocation="roles.xsd"/>
+    <include schemaLocation="services.xsd"/>
     
     <!-- Import ATOM specific schema definitions -->
     <import vc:minVersion="1.1" namespace="http://www.w3.org/2005/Atom"
@@ -78,6 +79,7 @@
         <attribute name="username" type="xsd:string"/>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
+    
     <complexType name="ServiceCatalog">
         <annotation>
             <xsd:documentation xml:lang="EN" xmlns="http://www.w3.org/1999/xhtml">
@@ -107,7 +109,7 @@
             </xsd:appinfo>
         </annotation>
         <sequence>
-            <element name="service" type="identity:Service" minOccurs="1" maxOccurs="unbounded">
+            <element name="service" type="identity:ServiceForCatalog" minOccurs="1" maxOccurs="unbounded">
                 <annotation>
                     <xsd:documentation
                             xml:lang="EN"
@@ -123,7 +125,8 @@
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
-    <complexType name="Service">
+    
+    <complexType name="ServiceForCatalog">
         <sequence>
             <element name="endpoint" type="identity:EndpointForService" minOccurs="1" maxOccurs="unbounded">
                 <annotation>
@@ -163,6 +166,7 @@
         </attribute>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
+    
     <complexType name="EndpointForService">
         <attribute name="region" type="xsd:string" use="optional">
             <annotation>
@@ -217,88 +221,5 @@
         </attribute>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
-    
-    <!-- Simple Types -->
-    <simpleType name="ExtensibleServiceType">
-        <annotation>
-            <xsd:documentation
-                xml:lang="EN"
-                xmlns="http://www.w3.org/1999/xhtml">
-                <p>
-                    An extensible service type allows all of the
-                    strings defined in <a href="#type_ServiceType"
-                        title="See definition of
-                        ServiceType">ServiceType</a> or an
-                    alias prefixed status.
-                </p>
-            </xsd:documentation>
-        </annotation>
-        <union memberTypes="identity:ServiceType identity:ExtendedService"/>
-    </simpleType>
-    
-    <simpleType name="ServiceType">
-        <restriction base="xsd:string">
-            <enumeration value="compute">
-                <annotation>
-                    <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                        <p>
-                            The type for an OpenStack Compute API 1.1 compatible service.
-                        </p>
-                    </xsd:documentation>
-                </annotation>
-            </enumeration>
-            <enumeration value="object-store">
-                <annotation>
-                    <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                        <p>
-                            The type for a Swift-compatible service.
-                        </p>
-                    </xsd:documentation>
-                </annotation>
-            </enumeration>
-            <enumeration value="image-service">
-                <annotation>
-                    <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                        <p>
-                            The type for a Glance-compatible service
-                        </p>
-                    </xsd:documentation>
-                </annotation>
-            </enumeration>
-            <enumeration value="identity">
-                <annotation>
-                    <xsd:documentation
-                        xml:lang="EN"
-                        xmlns="http://www.w3.org/1999/xhtml">
-                        <p>
-                            The type for a Keystone-compatible service.
-                        </p>
-                    </xsd:documentation>
-                </annotation>
-            </enumeration>
-        </restriction>
-    </simpleType>
-    
-    <simpleType name="ExtendedService">
-        <annotation>
-            <xsd:documentation
-                xml:lang="EN"
-                xmlns="http://www.w3.org/1999/xhtml">
-                <p>
-                    A non-core service type which must contain an extension prefix.
-                </p>
-            </xsd:documentation>
-        </annotation>
-        <restriction base="xsd:string">
-            <pattern value="\w+-\w+:\w+"/>
-        </restriction>
-    </simpleType>
-    
 </schema>
 
diff --git a/keystone/content/service/identity.wadl b/keystone/content/service/identity.wadl
index 7f0f1a1c..746b2087 100644
--- a/keystone/content/service/identity.wadl
+++ b/keystone/content/service/identity.wadl
@@ -46,7 +46,6 @@
                 <method href="#authenticate"/>
             </resource>
             <resource id="tenants" path="tenants">
-                <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
                 <method href="#listTenants"/>
             </resource>
         </resource>
-- 
cgit