Merge "Admin WADL updates"

4 files changed, 178 insertions, 208 deletions

diff --git a/keystone/content/admin/identity-admin-RAX.wadl b/keystone/content/admin/identity-admin-RAX.wadl
index 7dd8dbdc..16de86d9 100644
--- a/keystone/content/admin/identity-admin-RAX.wadl
+++ b/keystone/content/admin/identity-admin-RAX.wadl
@@ -165,27 +165,27 @@
         </response>
         <response xmlns="http://wadl.dev.java.net/2009/02" status="503">
             <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-            <representation mediaType="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            
     </method>
@@ -216,27 +216,27 @@
         </response>
         <response xmlns="http://wadl.dev.java.net/2009/02" status="503">
             <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-            <representation mediaType="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            
     </method>
@@ -259,33 +259,33 @@
         </response>
         <response xmlns="http://wadl.dev.java.net/2009/02" status="503">
             <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-            <representation mediaType="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            
     </method>
diff --git a/keystone/content/admin/identity-admin.wadl b/keystone/content/admin/identity-admin.wadl
index 48528df5..768d0c78 100644
--- a/keystone/content/admin/identity-admin.wadl
+++ b/keystone/content/admin/identity-admin.wadl
@@ -17,22 +17,24 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xsi:schemaLocation="http://docs.openstack.org/identity/api/v2.0 xsd/api.xsd
-    http://docs.openstack.org/common/api/v1.0 xsd/api-common.xsd
-    http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd
-    ">
+    	http://docs.openstack.org/common/api/v1.0 xsd/api-common.xsd
+    	http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.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:5000">
+    <resources base="http://localhost:5001">
         <resource id="version" type="#VersionDetails" path="v2.0/">
+        	<param name="X-Auth-Token" style="header" type="xsd:string" required="true">
+	            <doc>You need a valid admin token for access.</doc>
+	        </param>
             <resource id="extensions" type="#ExtensionList" path="extensions">
                 <method href="#listExtensions"/>
                 <resource id="extension" path="{alias}">
@@ -43,75 +45,107 @@
             <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 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>    
+                        <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 id="roles" path="roles">
+                        <method href="#getRoles"/>
+                        <resource id="role" path="{roleId}">
+                            <param name="roleId" style="template" type="xsd:string"/>
+                            <method href="#getRole"/>
+                            <resource id="users" path="users">
+                                <method href="#addUsers"/>
+                                <resource id="user" path="{username}">
+                                    <param name="username" style="template" type="xsd:string"/>
+                                    <method href="#addUser"/>
+                                    <resource id="role" path="{role}">
+                                        <method href="#addRoles"/>
+                                    </resource>
+                                </resource>
+                            </resource>
+                        </resource>
+                    </resource>
+                    <resource id="users" path="users">
+                        <param name="role" style="query" type="xsd:string" required="false"/>
+                        <method href="#getUsers"/>
+                        <resource id="user" path="{username}">
+                            <param name="username" style="template" type="xsd:string"/>
+                            <resource id="roles" path="roles">
+                                <resource id="role" path="{roleId}">
+                                    <method href="#addRole"/>
+                                    <method href="#deleteRole"/>
+                                </resource>
+                            </resource>
+                            <resource id="role" path="role">
+                                <method href="#addUsers"/>
+                            </resource>
+                        </resource>
+                    </resource>
+                </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"/>
+                <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="#listRoles"/>
                         <resource id="role" path="{roleId}">
                             <param name="roleId" style="template" type="xsd:int"/>
+                            <method href="#addRole"/>
                             <method href="#getRole"/>
-                        </resource> 
-                    </resource> 
-               </resource>
-	        </resource>
-	    
+                            <method href="#deleteRole"/>
+                        </resource>
+                    </resource>
+                    <resource id="userCredentials" path="credentials">
+                        <resource id="credentialType" path="{credentialType}">
+                            <param name="credentialType" style="template" type="xsd:string"/>
+                            <method href="#addCredential"/>
+                            <method href="#getCredential"/>
+                            <resource id="credentialId" path="{credentialId}">
+                                <param name="credentialId" style="template" type="xsd:string"/>
+                                <method href="#getCredential"/>
+                            </resource>
+                        </resource>
+                    </resource>
+                </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"/>
+            <resource id="roles" path="roles">
                 <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="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"/>
@@ -119,8 +153,7 @@
             </resource>
         </resource>
     </resources>
-
-
+    
     <!--*******************************************************-->
     <!--               Resource Types                          -->
     <!--*******************************************************-->
@@ -128,18 +161,13 @@
     <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>
+            <p xmlns="http://www.w3.org/1999/xhtml">A list of supported extensions.</p>
         </doc>
         <method href="#listExtensions"/>
     </resource_type>
-
-
-
+    
     <!--*******************************************************-->
     <!--               All Methods                             -->
     <!--*******************************************************-->
@@ -147,10 +175,8 @@
     <!-- 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>
+            <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">
@@ -160,45 +186,44 @@
             </representation>
             <representation mediaType="application/json"/>
         </response>
-        <!-- Common Faults -->
         
+        <!-- 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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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>
+            <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">
@@ -211,90 +236,85 @@
             </representation>
             <representation mediaType="application/json"/>
         </response>
-        <!-- Common Faults -->
         
+        <!-- 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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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>
+            <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-->
         
+        <!-- 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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <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="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
-           
     </method>
-
-
+    
     <!-- Token Operations -->
+    
     <method name="POST" id="authenticate">
         <request>
             <representation mediaType="application/xml" element="identity:passwordCredentials"/>
@@ -323,7 +343,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="GET" id="validateToken">
         <request>
             <param name="belongsTo" style="query" required="false" type="xsd:string"/>
@@ -355,10 +374,8 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="HEAD" id="checkToken">
-        <request>
-        </request>
+        <request></request>
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:auth"/>
             <representation mediaType="application/json"/>
@@ -386,7 +403,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="DELETE" id="revokeToken">
         <response status="204"/>
         <response status="401">
@@ -411,8 +427,9 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
+    
     <!-- Tenant Operations -->
+    
     <method name="GET" id="getTenants">
         <request>
             <param name="marker" style="query" required="false" type="xsd:string"/>
@@ -444,7 +461,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="PUT" id="createTenant">
         <request>
             <representation mediaType="application/xml" element="identity:tenant"/>
@@ -476,7 +492,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="GET" id="getTenant">
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:tenant"/>
@@ -504,16 +519,11 @@
             <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="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>
@@ -527,7 +537,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="PUT" id="updateTenant">
         <request>
             <representation mediaType="application/xml" element="identity:tenant"/>
@@ -559,7 +568,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="DELETE" id="deleteTenant">
         <response status="204"/>
         <response status="401">
@@ -586,6 +594,7 @@
     </method>
     
     <!--User Operations-->
+    
     <method name="GET" id="getUsers">
         <request>
             <param name="marker" style="query" required="false" type="xsd:string"/>
@@ -617,7 +626,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="PUT" id="createUser">
         <request>
             <representation mediaType="application/xml" element="identity:tenant"/>
@@ -649,7 +657,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="GET" id="getUser">
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:user"/>
@@ -677,7 +684,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="HEAD" id="checkUser">
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:user"/>
@@ -705,7 +711,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="PUT" id="updateUser">
         <request>
             <representation mediaType="application/xml" element="identity:tenant"/>
@@ -737,7 +742,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="DELETE" id="deleteUser">
         <response status="204"/>
         <response status="401">
@@ -762,7 +766,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-    
     <method name="PUT" id="setUserEnabled">
         <request>
             <representation mediaType="application/xml" element="identity:user">
@@ -796,7 +799,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="PUT" id="setUserPassword">
         <request>
             <representation mediaType="application/xml" element="identity:user">
@@ -830,7 +832,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-    
     <method name="PUT" id="setUserTenant">
         <request>
             <representation mediaType="application/xml" element="identity:user">
@@ -863,8 +864,7 @@
         <response status="401 403 404 400 500 503">
             <representation mediaType="application/json"/>
         </response>
-    </method>    
-
+    </method>
     <method name="GET" id="getEndpointTemplates">
         <request>
             <param name="serviceName" style="query" required="false" type="xsd:string"/>
@@ -892,7 +892,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="GET" id="getEndpointTemplate">
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:endpointTemplate"/>
@@ -920,9 +919,8 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-    
     <method name="POST" id="addEndpointTemplate">
-	<request>
+        <request>
             <representation mediaType="application/xml" element="identity:role"/>
             <representation mediaType="application/json"/>
         </request>
@@ -955,8 +953,7 @@
         <response status="400 401 403 404 500 503">
             <representation mediaType="application/json"/>
         </response>
-     </method>
-    
+    </method>
     <method name="DELETE" id="deleteEndpointTemplate">
         <response status="204"/>
         <response status="400">
@@ -981,7 +978,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="GET" id="getEndpoints">
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:endpoints"/>
@@ -1006,7 +1002,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="POST" id="addEndpoint">
         <request>
             <representation mediaType="application/xml" element="identity:endpoint"/>
@@ -1042,7 +1037,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="GET" id="getEndpoint">
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:endpoint"/>
@@ -1070,7 +1064,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="DELETE" id="deleteEndpoint">
         <response status="204"/>
         <response status="400">
@@ -1096,8 +1089,9 @@
         </response>
     </method>
     
-	<!--Roles-->
-	<method name="GET" id="getRoles">
+    <!--Roles-->
+    
+    <method name="GET" id="getRoles">
         <request>
             <param name="serviceId" style="query" required="false" type="xsd:string"/>
         </request>
@@ -1124,7 +1118,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="GET" id="getRole">
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:role"/>
@@ -1152,9 +1145,8 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-    
     <method name="POST" id="addRole">
-	<request>
+        <request>
             <representation mediaType="application/xml" element="identity:role"/>
             <representation mediaType="application/json"/>
         </request>
@@ -1187,8 +1179,7 @@
         <response status="400 401 403 404 500 503">
             <representation mediaType="application/json"/>
         </response>
-     </method>
-    
+    </method>
     <method name="DELETE" id="deleteRole">
         <response status="204"/>
         <response status="400">
@@ -1213,7 +1204,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="GET" id="getRoleRefs">
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:roleRefs"/>
@@ -1238,7 +1228,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="POST" id="addRoleRef">
         <request>
             <representation mediaType="application/xml" element="identity:roleRef"/>
@@ -1274,7 +1263,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="GET" id="getRoleRef">
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:roleRef"/>
@@ -1302,7 +1290,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="DELETE" id="deleteRoleRef">
         <response status="204"/>
         <response status="400">
@@ -1327,8 +1314,7 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-    
-	<method name="GET" id="getServices">
+    <method name="GET" id="getServices">
         <request>
             <param name="serviceId" style="query" required="false" type="xsd:string"/>
         </request>
@@ -1355,7 +1341,6 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-
     <method name="GET" id="getService">
         <response status="200 203">
             <representation mediaType="application/xml" element="identity:service"/>
@@ -1383,9 +1368,8 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-    
     <method name="POST" id="addService">
-	<request>
+        <request>
             <representation mediaType="application/xml" element="identity:service"/>
             <representation mediaType="application/json"/>
         </request>
@@ -1418,8 +1402,7 @@
         <response status="400 401 403 404 500 503">
             <representation mediaType="application/json"/>
         </response>
-     </method>
-    
+    </method>
     <method name="DELETE" id="deleteService">
         <response status="204"/>
         <response status="400">
diff --git a/keystone/content/common/common.ent b/keystone/content/common/common.ent
index 0dc6ddbe..dcd942e5 100644
--- a/keystone/content/common/common.ent
+++ b/keystone/content/common/common.ent
@@ -11,27 +11,27 @@
         </response>
         <response status="503" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
         <response status="401" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="identity:unauthorized"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
         <response status="403" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="identity:forbidden"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
         <response status="400" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="identity:badRequest"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
         <response status="405" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="identity:badMethod"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
         <response status="413" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="identity:overLimit"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            '>
       <!--
@@ -41,7 +41,7 @@
            '
         <response status="404" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="identity:itemNotFound"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            '>
       <!--
@@ -51,6 +51,6 @@
            '
         <response status="415" xmlns="http://wadl.dev.java.net/2009/02">
             <representation mediaType="application/xml" element="identity:badMediaType"/>
-            <representation mediaType="applicaiton/json"/>
+            <representation mediaType="application/json"/>
         </response>
            '>
diff --git a/keystone/content/service/identity.wadl b/keystone/content/service/identity.wadl
index ce9506da..b0575af9 100644
--- a/keystone/content/service/identity.wadl
+++ b/keystone/content/service/identity.wadl
@@ -12,21 +12,20 @@
 ]>
 
 <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 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
-                                 ">
+    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 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
+        ">
 
     <grammars>
         <include href="xsd/api.xsd"/>
         <include href="xsd/api-common.xsd"/>
     </grammars>
 
-
     <!--*******************************************************-->
     <!--             All Resoruces                             -->
     <!--*******************************************************-->
@@ -44,13 +43,12 @@
                 <method href="#authenticate"/>
             </resource>
             <resource id="tenants" path="tenants">
-	        <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
+                <param name="X-Auth-Token" style="header" type="xsd:string" required="true"/>
                 <method href="#listTenants"/>
             </resource>
         </resource>
     </resources>
 
-
     <!--***************************************************-->
     <!--               Resource Types                          -->
     <!--*******************************************************-->
@@ -58,29 +56,23 @@
     <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>
+            <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>
+            <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">
@@ -90,16 +82,15 @@
             </representation>
             <representation mediaType="application/json"/>
         </response>
-        &commonFaults; 
+        &commonFaults;
         &getFaults;
     </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>
+            <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">
@@ -112,26 +103,23 @@
             </representation>
             <representation mediaType="application/json"/>
         </response>
-        &commonFaults; 
+        &commonFaults;
         &getFaults;
     </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>
+            <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>
-        &commonFaults; 
+        &commonFaults;
         &getFaults;
     </method>
 
-
     <!-- Token Operations -->
+
     <method name="POST" id="authenticate">
         <request>
             <representation mediaType="application/xml" element="identity:passwordCredentials"/>
@@ -145,12 +133,12 @@
             <representation mediaType="application/xml" element="identity:userDisabled"/>
             <representation mediaType="application/json"/>
         </response>
-        &commonFaults; 
+        &commonFaults;
         &getFaults;
     </method>
 
-
     <!-- Tenant Operations -->
+
     <method name="GET" id="listTenants">
         <request>
             <param name="marker" style="query" required="false" type="xsd:string"/>
@@ -160,8 +148,7 @@
             <representation mediaType="application/xml" element="identity:tenants"/>
             <representation mediaType="application/json"/>
         </response>
-        &commonFaults; 
+        &commonFaults;
         &getFaults;
     </method>
-  
 </application>