From 440c2fd8e93fb8ed1c08736f7eb435c698d7207c Mon Sep 17 00:00:00 2001
From: Diane Fleming <diflemin@cisco.com>
Date: Tue, 5 May 2015 15:34:00 -0500
Subject: [PATCH] Remove XML samples for Identity v2.0 extensions

Change-Id: Id4b1a08f80ae049e7572fc195306abdc9545d606
Closes-Bug: #1445104
---
 api-ref/src/docbkx/ch_identity-v2-ext.xml     |  81 +-------
 .../src/v2.0/OS-KSADM/samples/credentials.xml |   5 -
 .../src/v2.0/OS-KSADM/samples/role.xml        |   4 -
 .../src/v2.0/OS-KSADM/samples/roles.xml       |   6 -
 .../src/v2.0/OS-KSADM/samples/service.xml     |   5 -
 .../src/v2.0/OS-KSADM/samples/services.xml    |   8 -
 .../src/v2.0/OS-KSADM/samples/tenant.xml      |   5 -
 .../v2.0/OS-KSADM/samples/tenantwithoutid.xml |   5 -
 .../OS-KSADM/samples/user-role-list-resp.xml  |   5 -
 .../src/v2.0/OS-KSADM/samples/user.xml        |   4 -
 .../src/v2.0/OS-KSADM/samples/users.xml       |   9 -
 .../OS-KSADM/samples/userwithenabledonly.xml  |   5 -
 .../v2.0/OS-KSADM/samples/userwithoutid.xml   |   6 -
 .../v2.0/OS-KSCATALOG/samples/endpoint.xml    |  18 --
 .../OS-KSCATALOG/samples/endpointTemplate.xml |  18 --
 .../samples/endpointTemplateWithOnlyId.xml    |   6 -
 .../samples/endpointTemplates.xml             |  67 -------
 .../v2.0/OS-KSCATALOG/samples/endpoints.xml   |  75 -------
 .../samples/auth_credentials-OS-KSEC2.xml     |  10 -
 .../OS-KSEC2/samples/credentialswithec2.xml   |   7 -
 .../v2.0/OS-KSEC2/samples/ec2Credentials.xml  |   6 -
 .../OS-KSS3/samples/credentialswiths3.xml     |   7 -
 .../v2.0/OS-KSS3/samples/s3Credentials.xml    |   6 -
 .../v2.0/OS-KSVALIDATE/samples/endpoints.xml  |  75 -------
 .../OS-KSVALIDATE/samples/validatetoken.xml   |  12 --
 .../src/v2.0/wadl/OS-KSADM-admin.wadl         | 186 ------------------
 .../src/v2.0/wadl/OS-KSCATALOG-admin.wadl     | 113 +----------
 .../src/v2.0/wadl/OS-KSEC2-admin.wadl         |  82 +-------
 .../src/v2.0/wadl/OS-KSS3-admin.wadl          |  72 +------
 .../src/v2.0/wadl/OS-KSVALIDATE-admin.wadl    |  22 +--
 30 files changed, 36 insertions(+), 894 deletions(-)
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/credentials.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/role.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/roles.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/service.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/services.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/tenant.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/tenantwithoutid.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user-role-list-resp.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithenabledonly.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpoint.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplate.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplates.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpoints.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/credentialswithec2.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/ec2Credentials.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSS3/samples/credentialswiths3.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSS3/samples/s3Credentials.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSVALIDATE/samples/endpoints.xml
 delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/OS-KSVALIDATE/samples/validatetoken.xml

diff --git a/api-ref/src/docbkx/ch_identity-v2-ext.xml b/api-ref/src/docbkx/ch_identity-v2-ext.xml
index 30c69ff08..cf42eddf0 100644
--- a/api-ref/src/docbkx/ch_identity-v2-ext.xml
+++ b/api-ref/src/docbkx/ch_identity-v2-ext.xml
@@ -12,80 +12,15 @@
     version="5.0-extension RackBook-2.0" xml:id="identity-v2-ext"
     role="api-reference">
     <title>Identity API v2.0 extensions (SUPPORTED)</title>
-    <para>Queries the Identity API to list available extensions with a
-        &GET; request to <code>v2.0/extensions</code>.</para>
-    <section xml:id="os-ksadm-admin-ext">
+    <para>
+        To list available Identity API v2.0 extensions, issue a &GET; request
+        to <code>v2.0/extensions</code>.
+    </para>
+     <section xml:id="os-ksadm-admin-ext">
         <title>OS-KSADM admin extension</title>
-        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#users-v2.0">
-                <wadl:method href="#listUsers"/>
-                <wadl:method href="#addUser"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userById-v2.0">
-                <wadl:method href="#updateUser"/>
-                <wadl:method href="#deleteUser"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userRoles-v2.0">
-                <wadl:method href="#listUserRoles"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userRoleById-v2.0">
-                <wadl:method href="#addUserRole"/>
-                <wadl:method href="#deleteUserRole"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#tenants-v2.0">
-                <wadl:method href="#addTenant"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#tenantById-v2.0">
-                <wadl:method href="#updateTenant"/>
-                <wadl:method href="#deleteTenant"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#usersForTenant-v2.0">
-                <wadl:method href="#listUsersForTenant"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userSpecificRoleForTenant-v2.0">
-                <wadl:method href="#addRolesToUserOnTenant"/>
-                <wadl:method href="#deleteRoleFromUserOnTenant"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roles-v2.0">
-                <wadl:method href="#getRoleByName"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roles_list-v2.0">
-                <wadl:method href="#listRoles"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roles-v2.0">
-                <wadl:method href="#addRole"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roleId-v2.0">
-                <wadl:method href="#getRole"/>
-                <wadl:method href="#deleteRole"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#services-v2.0">
-                <wadl:method href="#listServices"/>
-                <wadl:method href="#addService"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#serviceName-v2.0">
-                <wadl:method href="#getServiceByName"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#serviceId-v2.0">
-                <wadl:method href="#getService"/>
-                <wadl:method href="#deleteService"/>
-            </wadl:resource>
-        </wadl:resources>
+        <wadl:resources
+             xmlns:wadl="http://wadl.dev.java.net/2009/02"
+             href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl"/>
     </section>
     <section xml:id="os-kscatalog-ext">
         <title>OS-KSCATALOG admin extension</title>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/credentials.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/credentials.xml
deleted file mode 100644
index b4e462f23..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/credentials.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<credentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <passwordCredentials username="test_user" password="secretsecret"/>
-</credentials>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/role.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/role.xml
deleted file mode 100644
index dd25cfff8..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/role.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<role xmlns="http://docs.openstack.org/identity/api/v2.0"
-  id="123" name="Admin" description="All Access" />
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/roles.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/roles.xml
deleted file mode 100644
index 30596f92c..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/roles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
-  <role id="123" name="Admin" description="All Access" />
-  <role id="234" name="Guest" description="Guest Access" />
-</roles>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/service.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/service.xml
deleted file mode 100644
index 0da679112..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/service.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service
-    xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
-    id="123" name="nova" type="compute"
-    description="OpenStack Compute Service"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/services.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/services.xml
deleted file mode 100644
index 14a5d8d7d..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/services.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<services
-  xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0">
-  <service id="123" name="nova" type="compute"
-    description="OpenStack Compute Service"/>
-  <service id="234" name="glance" type="image"
-    description="OpenStack Image Service"/>
-</services>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/tenant.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/tenant.xml
deleted file mode 100644
index ce0137beb..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/tenant.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
-        enabled="true" id="1234" name="ACME Corp">
-    <description>A description...</description>
-</tenant>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/tenantwithoutid.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/tenantwithoutid.xml
deleted file mode 100644
index 3983684bb..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/tenantwithoutid.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
-        enabled="true" name="ACME Corp">
-    <description>A description...</description>
-</tenant>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user-role-list-resp.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user-role-list-resp.xml
deleted file mode 100644
index 327d9977f..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user-role-list-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <role id="8341d3603a1d4d5985bff09f10704d4d" name="service"/>
-    <role id="2e66d57df76946fdbe034bc4da6fdec0" name="admin"/>
-</roles>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.xml
deleted file mode 100644
index 40ca2a6f9..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/identity/api/v2.0"
-      enabled="true" email="john.smith@example.org"
-      name="jqsmith" id="u1000"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.xml
deleted file mode 100644
index 5b045c970..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<users xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <user xmlns="http://docs.openstack.org/identity/api/v2.0"
-          enabled="true" email="john.smith@example.org"
-          name="jqsmith" id="u1000"/>
-    <user xmlns="http://docs.openstack.org/identity/api/v2.0"
-          enabled="true" email="john.smith@example.org"
-          name="jqsmith" id="u1001"/>
-</users>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithenabledonly.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithenabledonly.xml
deleted file mode 100644
index cf290ceb5..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithenabledonly.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="UserWithOnlyEnabled"
- enabled="true"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.xml
deleted file mode 100644
index 6f9f17664..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/identity/api/v2.0"
-      xmlns:OS-KSADM="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
-      enabled="true" email="john.smith@example.org"
-      name="jqsmith"
-      OS-KSADM:password="secretsecret"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpoint.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpoint.xml
deleted file mode 100644
index f71112ff0..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpoint.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<endpoint
-            id="1"
-            tenantId="1"
-            type="compute"
-            name="Compute"
-            region="North"
-            publicURL="https://compute.north.public.com/v1"
-            internalURL="https://compute.north.internal.com/v1"
-            adminURL="https://compute.north.internal.com/v1"
-            xmlns="http://docs.openstack.org/identity/api/v2.0">
-            <version
-                        id="1"
-                        info="https://compute.north.public.com/v1/"
-                        list="https://compute.north.public.com/"
-            />
-</endpoint>
\ No newline at end of file
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplate.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplate.xml
deleted file mode 100644
index b252fbc20..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplate.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<endpointTemplate
-  xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
-  id="1"
-  region="North"
-  global="true"
-  type="compute"
-  name="Compute"
-  publicURL="https://service-public.com/v1"
-  internalURL="https://service-internal.com/v1"
-  enabled="true">
-  <version
-    id="1"
-    info="https://compute.north.public.com/v1/"
-    list="https://compute.north.public.com/"
-  />
-</endpointTemplate>
\ No newline at end of file
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml
deleted file mode 100644
index 6379b3ae3..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<endpointTemplate
-  xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:type="EndpointTemplateWithOnlyId"
-  id="1"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplates.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplates.xml
deleted file mode 100644
index 94771bef2..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpointTemplates.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<endpointTemplates xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0">
-  <endpointTemplate
-   id="1"
-   region="North"
-   global="true"
-   type="compute"
-   name="Compute"
-   publicURL="https://compute.north.public.com/v1"
-   internalURL="https://compute.north.internal.com/v1"
-   enabled="true">
-   <version
-     id="1"
-     list="https://compute.north.public.com/"
-     info="https://compute.north.public.com/v1"/>
-  </endpointTemplate>
-  <endpointTemplate
-   id="2"
-   region="south"
-   type="compute"
-   name="Compute"
-   publicURL="https://service2.public.com/v1"
-   internalURL="https://service2.internal.public.com/v1"
-   enabled="false">
-   <version
-    id="1"
-    list="https://service1.public.com/"
-    info="https://service1.public.com/v1"/>
-  </endpointTemplate>
-  <endpointTemplate
-   id="3"
-   region="DFW"
-   global="true"
-   type="ext1:service1"
-   name="Compute"
-   publicURL="https://service1.public.com/v1"
-   enabled="true">
-   <version
-    id="1"
-    list="https://service1.public.com/"
-    info="https://service1.public.com/v1"/>
-  </endpointTemplate>
-  <endpointTemplate
-   id="4"
-   region="ORD"
-   type="compute"
-   name="Compute"
-   publicURL="https://service2.public.com/v1"
-   enabled="true">
-   <version
-    id="1"
-    list="https://service1.public.com/"
-    info="https://service1.public.com/v1"/>
-  </endpointTemplate>
-  <endpointTemplate
-   id="5"
-   global="true"
-   type="compute"
-   name="Compute"
-   publicURL="https://service3.public.com/v1">
-   <version
-    id="1"
-    list="https://service1.public.com/"
-    info="https://service1.public.com/v1"/>
-  </endpointTemplate>
-</endpointTemplates>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpoints.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpoints.xml
deleted file mode 100644
index 5307ff1ff..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSCATALOG/samples/endpoints.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<endpoints
-    xmlns="http://docs.openstack.org/identity/api/v2.0">
-  <endpoint
-      id="1"
-      tenantId="1"
-      type="compute"
-      name="Compute"
-      region="North"
-      publicURL="https://compute.north.public.com/v1"
-      internalURL="https://compute.north.internal.com/v1"
-      adminURL="https://compute.north.internal.com/v1">
-      <version
-          id="1"
-          info="https://compute.north.public.com/v1/"
-          list="https://compute.north.public.com/"
-      />
-  </endpoint>
-  <endpoint
-      id="2"
-      tenantId="2"
-      type="compute"
-      name="Compute"
-      region="South"
-      publicURL="https://compute.north.public.com/v1"
-      internalURL="https://compute.north.internal.com/v1"
-      adminURL="https://compute.north.internal.com/v1">
-      <version
-          id="1"
-          info="https://compute.north.public.com/v1/"
-          list="https://compute.north.public.com/"
-      />
-  </endpoint>
-  <endpoint
-      id="3"
-      tenantId="1"
-      type="compute"
-      name="Compute"
-      region="East"
-      publicURL="https://compute.north.public.com/v1"
-      internalURL="https://compute.north.internal.com/v1"
-      adminURL="https://compute.north.internal.com/v1"
-  />
-  <endpoint
-      id="4"
-      tenantId="1"
-      type="compute"
-      name="Compute"
-      region="West"
-      publicURL="https://compute.north.public.com/v1"
-      internalURL="https://compute.north.internal.com/v1"
-      adminURL="https://compute.north.internal.com/v1">
-      <version
-          id="1"
-          info="https://compute.north.public.com/v1/"
-          list="https://compute.north.public.com/"
-      />
-  </endpoint>
-  <endpoint
-      id="5"
-      tenantId="1"
-      type="compute"
-      name="Compute"
-      region="Global"
-      publicURL="https://compute.north.public.com/v1"
-      internalURL="https://compute.north.internal.com/v1"
-      adminURL="https://compute.north.internal.com/v1">
-      <version
-          id="1"
-          info="https://compute.north.public.com/v1/"
-          list="https://compute.north.public.com/"
-      />
-  </endpoint>
-</endpoints>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml
deleted file mode 100644
index ec4f33140..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<auth
-  xmlns="http://docs.openstack.org/identity/api/v2.0"
-  tenantId="1234">
-  <ec2Credentials
-    xmlns="http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0"
-    username="testuser"
-    key="aaaaa"
-    signature="bbbbb"/>
-</auth>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/credentialswithec2.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/credentialswithec2.xml
deleted file mode 100644
index be4f945e6..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/credentialswithec2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<credentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <passwordCredentials username="test_user" password="secretsecret"/>
-    <ec2Credentials xmlns="http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0"
-        username="testuser" key="aaaaa" signature="bbbbb"/>
-</credentials>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/ec2Credentials.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/ec2Credentials.xml
deleted file mode 100644
index 6faf96af3..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSEC2/samples/ec2Credentials.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-  <ec2Credentials
-    xmlns="http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0"
-    username="testuser"
-    key="aaaaa"
-    signature="bbbbb"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSS3/samples/credentialswiths3.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSS3/samples/credentialswiths3.xml
deleted file mode 100644
index a12bd8073..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSS3/samples/credentialswiths3.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<credentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <passwordCredentials username="test_user" password="secretsecret"/>
-    <s3Credentials xmlns="http://docs.openstack.org/identity/api/ext/OS-KSS3/v1.0"
-        username="testuser" key="aaaaa" signature="bbbbb"/>
-</credentials>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSS3/samples/s3Credentials.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSS3/samples/s3Credentials.xml
deleted file mode 100644
index b121feb9a..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSS3/samples/s3Credentials.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<s3Credentials
-    xmlns="http://docs.openstack.org/identity/api/ext/OS-KSS3/v1.0"
-    username="testuser"
-    key="aaaaa"
-    signature="bbbbb"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSVALIDATE/samples/endpoints.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSVALIDATE/samples/endpoints.xml
deleted file mode 100644
index 5307ff1ff..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSVALIDATE/samples/endpoints.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<endpoints
-    xmlns="http://docs.openstack.org/identity/api/v2.0">
-  <endpoint
-      id="1"
-      tenantId="1"
-      type="compute"
-      name="Compute"
-      region="North"
-      publicURL="https://compute.north.public.com/v1"
-      internalURL="https://compute.north.internal.com/v1"
-      adminURL="https://compute.north.internal.com/v1">
-      <version
-          id="1"
-          info="https://compute.north.public.com/v1/"
-          list="https://compute.north.public.com/"
-      />
-  </endpoint>
-  <endpoint
-      id="2"
-      tenantId="2"
-      type="compute"
-      name="Compute"
-      region="South"
-      publicURL="https://compute.north.public.com/v1"
-      internalURL="https://compute.north.internal.com/v1"
-      adminURL="https://compute.north.internal.com/v1">
-      <version
-          id="1"
-          info="https://compute.north.public.com/v1/"
-          list="https://compute.north.public.com/"
-      />
-  </endpoint>
-  <endpoint
-      id="3"
-      tenantId="1"
-      type="compute"
-      name="Compute"
-      region="East"
-      publicURL="https://compute.north.public.com/v1"
-      internalURL="https://compute.north.internal.com/v1"
-      adminURL="https://compute.north.internal.com/v1"
-  />
-  <endpoint
-      id="4"
-      tenantId="1"
-      type="compute"
-      name="Compute"
-      region="West"
-      publicURL="https://compute.north.public.com/v1"
-      internalURL="https://compute.north.internal.com/v1"
-      adminURL="https://compute.north.internal.com/v1">
-      <version
-          id="1"
-          info="https://compute.north.public.com/v1/"
-          list="https://compute.north.public.com/"
-      />
-  </endpoint>
-  <endpoint
-      id="5"
-      tenantId="1"
-      type="compute"
-      name="Compute"
-      region="Global"
-      publicURL="https://compute.north.public.com/v1"
-      internalURL="https://compute.north.internal.com/v1"
-      adminURL="https://compute.north.internal.com/v1">
-      <version
-          id="1"
-          info="https://compute.north.public.com/v1/"
-          list="https://compute.north.public.com/"
-      />
-  </endpoint>
-</endpoints>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSVALIDATE/samples/validatetoken.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSVALIDATE/samples/validatetoken.xml
deleted file mode 100644
index 99e956bbf..000000000
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSVALIDATE/samples/validatetoken.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<access xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <token id="ab48a9efdfedb23ty3494" expires="2010-11-01T03:32:15-05:00">
-        <tenant id="456" name="My Project" />
-    </token>
-    <user id="123" name="jqsmith">
-        <roles xmlns="http://docs.openstack.org/identity/api/v2.0">
-            <role id="123" name="Admin" tenantId="one"/>
-            <role id="234" name="object-store:admin" tenantId="1"/>
-        </roles>
-    </user>
-</access>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
index 338428d35..2be980d71 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
@@ -203,15 +203,6 @@
             <para role="shortdesc">Creates a tenant.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="identity:tenant">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSADM/samples/tenantwithoutid.xml"
-                    />
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -222,14 +213,6 @@
             </representation>
         </request>
         <response status="201">
-            <representation mediaType="application/xml"
-                element="identity:tenant">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/tenant.xml"
-                    />
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -244,14 +227,6 @@
             <para role="shortdesc"> Updates a tenant.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="identity:tenant">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/tenant.xml"
-                    />
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -261,14 +236,6 @@
             </representation>
         </request>
         <response status="200">
-            <representation mediaType="application/xml"
-                element="identity:tenant">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/tenant.xml"
-                    />
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -293,13 +260,6 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:users">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/users.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -333,13 +293,6 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:userss">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/users.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -354,19 +307,6 @@
             <para role="shortdesc">Adds a user.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="identity:user">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSADM/samples/userwithoutid.xml"/>
-                </wadl:doc>
-                <param name="name" style="plain" path="/identity:user"
-                    type="String">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">The user name.</wadl:doc>
-                </param>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -377,13 +317,6 @@
             </representation>
         </request>
         <response status="201">
-            <representation mediaType="application/xml"
-                element="identity:user">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/user.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -397,13 +330,6 @@
             <para role="shortdesc">Updates a user.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="identity:user">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/user.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -412,13 +338,6 @@
             </representation>
         </request>
         <response status="200">
-            <representation mediaType="application/xml"
-                element="identity:user">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/user.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -453,20 +372,6 @@
                 </tbody></table>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="identity:user">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSADM/samples/userwithenabledonly.xml"
-                    />
-                </wadl:doc>
-                <param name="user" style="plain" path="/identity:user"
-                    type="UserWithOnlyEnabled">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">The user name.</wadl:doc>
-                </param>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -477,13 +382,6 @@
             </representation>
         </request>
         <response status="200">
-            <representation mediaType="application/xml"
-                element="identity:user">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/user.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -510,15 +408,6 @@
                     />
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml"
-                element="identity:roles">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSADM/samples/user-role-list-resp.xml"
-                    />
-                </wadl:doc>
-            </representation>
         </response> &commonFaults; &getFaults; </method>
     <method name="PUT" id="addUserRole">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@@ -546,13 +435,6 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:roles">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/roles.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -579,13 +461,6 @@
             <para role="shortdesc">Adds a role.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="identity:role">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/role.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -595,13 +470,6 @@
         </request>
         <response status="201">
 
-            <representation mediaType="application/xml"
-                element="identity:role">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/role.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -620,13 +488,6 @@
             <para role="shortdesc">Gets a role by name.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:role">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/role.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -646,13 +507,6 @@
                 role.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:role">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/role.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -682,14 +536,6 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="services">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSADM/samples/services.xml"/>
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -705,14 +551,6 @@
         </wadl:doc>
 
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="service">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/service.xml"
-                    />
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -727,14 +565,6 @@
             <para role="shortdesc">Gets a service.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="service">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/service.xml"
-                    />
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -749,14 +579,6 @@
             <para role="shortdesc">Adds a service.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="service">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/service.xml"
-                    />
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
@@ -766,14 +588,6 @@
             </representation>
         </request>
         <response status="201">
-            <representation mediaType="application/xml"
-                element="service">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="../OS-KSADM/samples/service.xml"
-                    />
-                </wadl:doc>
-            </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSCATALOG-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSCATALOG-admin.wadl
index 16eed7510..5452be8cc 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSCATALOG-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSCATALOG-admin.wadl
@@ -127,16 +127,7 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="endpointTemplates">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="../OS-KSCATALOG/samples/endpointTemplates.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="endpointTemplates">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
@@ -152,16 +143,7 @@
             <para role="shortdesc">Gets endpoint templates.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="endpointTemplate">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="../OS-KSCATALOG/samples/endpointTemplate.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="endpointTemplate">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
@@ -177,16 +159,7 @@
             <para role="shortdesc">Adds endpoint template.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="endpointTemplate">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="../OS-KSCATALOG/samples/endpointTemplate.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="endpointTemplate">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
@@ -196,18 +169,7 @@
             </representation>
         </request>
         <response status="201">
-            <representation mediaType="application/xml"
-                element="endpointTemplate">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="../OS-KSCATALOG/samples/endpointTemplate.xml"
-                    />
-                </wadl:doc>
-                <param name="Location" type="xsd:anyURI"
-                    style="header"/>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="endpointTemplate">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
@@ -225,16 +187,7 @@
             <para role="shortdesc">Updates endpoint template.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="endpointTemplate">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="../OS-KSCATALOG/samples/endpointTemplate.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="endpointTemplate">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
@@ -244,16 +197,7 @@
             </representation>
         </request>
         <response status="200">
-            <representation mediaType="application/xml"
-                element="endpointTemplate">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="../OS-KSCATALOG/samples/endpointTemplate.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="endpointTemplate">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
@@ -277,18 +221,7 @@
             <para role="shortdesc">Adds endpoint to a tenant.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="endpointTemplate">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="../OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml"
-                    />
-                </wadl:doc>
-                <param name="endpoint" style="plain" path="/"
-                    type="EndpointTemplateWithOnlyId"/>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="endpointTemplate">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
@@ -298,17 +231,7 @@
             </representation>
         </request>
         <response status="201">
-            <representation mediaType="application/xml"
-                element="identity:endpoint">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="../OS-KSCATALOG/samples/endpoint.xml"/>
-                </wadl:doc>
-                <param name="Location" type="xsd:anyURI"
-                    style="header"/>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:endpoint">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
@@ -329,15 +252,7 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:endpoints">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="../OS-KSCATALOG/samples/endpoints.xml"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:endpoints">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
@@ -353,15 +268,7 @@
             <para role="shortdesc">Gets endpoint for a tenant.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:endpoint">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="../OS-KSCATALOG/samples/endpoint.xml"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:endpoint">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSEC2-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSEC2-admin.wadl
index 240e88743..8b31efd31 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSEC2-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSEC2-admin.wadl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- (C) 2011-2014 OpenStack Foundation, All Rights Reserved -->
+<!-- (C) 2011-2015 OpenStack Foundation, All Rights Reserved -->
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
@@ -91,16 +91,7 @@
             <para role="shortdesc">Adds a credential to a user.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="ec2Credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSEC2/samples/ec2Credentials.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="ec2Credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -110,16 +101,7 @@
             </representation>
         </request>
         <response status="201">
-            <representation mediaType="application/xml"
-                element="ec2Credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSEC2/samples/ec2Credentials.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="ec2Credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -128,7 +110,6 @@
                 </wadl:doc>
             </representation>
         </response> &commonFaults; &postPutFaults; &getFaults; </method>
-
     <method name="GET" id="listCredentials">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List credentials">
@@ -138,16 +119,7 @@
               &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSEC2/samples/credentialswithec2.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -156,7 +128,6 @@
                 </wadl:doc>
             </representation>
         </response> &commonFaults; &getFaults; </method>
-
     <method name="GET" id="listCredentialsByType">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List credentials by type">
@@ -166,19 +137,11 @@
               &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:credentials">
+            <representation mediaType="application/json" element="identity:credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../OS-KSADM/samples/credentials.xml"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSADM/samples/credentials.xml"/>
+                        href="../OS-KSADM/samples/credentials.json"/>
                 </wadl:doc>
             </representation>
         </response> &commonFaults; &getFaults; </method>
@@ -190,16 +153,7 @@
                 user.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="ec2Credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSEC2/samples/ec2Credentials.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="ec2Credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -209,16 +163,7 @@
             </representation>
         </request>
         <response status="200">
-            <representation mediaType="application/xml"
-                element="ec2Credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSEC2/samples/ec2Credentials.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="ec2Credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -242,16 +187,7 @@
             <para role="shortdesc">Gets user credentials.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="ec2Credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSEC2/samples/ec2Credentials.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="ec2Credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSS3-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSS3-admin.wadl
index 3266aca42..00c582818 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSS3-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSS3-admin.wadl
@@ -90,15 +90,7 @@
             <para role="shortdesc">Adds a credential to a user.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="s3credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSS3/samples/s3Credentials.xml"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="s3credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -107,15 +99,7 @@
             </representation>
         </request>
         <response status="201">
-            <representation mediaType="application/xml"
-                element="s3credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSS3/samples/s3Credentials.xml"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="s3credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -133,16 +117,7 @@
              &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSS3/samples/credentialswiths3.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -162,16 +137,7 @@
              &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSS3/samples/credentialswiths3.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -188,15 +154,7 @@
                 credentials.</para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/xml"
-                element="s3credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSS3/samples/s3Credentials.xml"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="s3credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -205,15 +163,7 @@
             </representation>
         </request>
         <response status="200">
-            <representation mediaType="application/xml"
-                element="s3credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSS3/samples/s3Credentials.xml"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="s3credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -238,15 +188,7 @@
                 credentials.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="s3credentials">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSS3/samples/s3Credentials.xml"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="s3credentials">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl
index e28112230..f506c32d7 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl
@@ -135,16 +135,7 @@
                 extensions such as HP-IDM.</para>
         </wadl:doc>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:access">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSVALIDATE/samples/validatetoken.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:access">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
@@ -182,16 +173,7 @@
             &limitMarkerReqParameter;
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml"
-                element="identity:endpoints">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../OS-KSVALIDATE/samples/endpoints.xml"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
+            <representation mediaType="application/json" element="identity:endpoints">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code