From cd1ce22abffede1210145bb2e0500d11da5b92c9 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Thu, 24 Oct 2013 09:58:22 -0500
Subject: [PATCH] Update compute-api to pull extensions from WADLs

Closes-Bug: #1212374

backport: none

Change-Id: I232e000250dda0c316f35e2678a8032e59c5b0f2
author: diane fleming
---
 openstack-compute-api-2/pom.xml               |  2 +-
 .../src/os-compute-devguide.xml               | 52 ++-----------------
 2 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/openstack-compute-api-2/pom.xml b/openstack-compute-api-2/pom.xml
index 0e245c6..c3b1fc8 100644
--- a/openstack-compute-api-2/pom.xml
+++ b/openstack-compute-api-2/pom.xml
@@ -46,7 +46,7 @@
             <plugin>
                 <groupId>com.rackspace.cloud.api</groupId>
                 <artifactId>clouddocs-maven-plugin</artifactId>
-                <version>1.12.0</version>
+                <version>1.12.1</version>
                 <executions>
                     <execution>
                         <id>goal1</id>
diff --git a/openstack-compute-api-2/src/os-compute-devguide.xml b/openstack-compute-api-2/src/os-compute-devguide.xml
index 92dae3b..83c2316 100755
--- a/openstack-compute-api-2/src/os-compute-devguide.xml
+++ b/openstack-compute-api-2/src/os-compute-devguide.xml
@@ -113,9 +113,7 @@
                 <revdescription>
                     <itemizedlist>
                         <listitem>
-                            <para>Added <xref
-                                   linkend="ext-os-admin-actions"/> to
-                                document the server admin actions
+                            <para>Added the server admin actions
                                 extension.</para>
                         </listitem>
                     </itemizedlist>
@@ -1646,7 +1644,7 @@ Host: servers.api.openstack.org/v2/
                         </author>
                         <date>2009-06-26T14:30:46</date>
                     </info>
-                    <para>Well need to revisit. List all status even
+                    <para>We will need to revisit. List all status even
                         the ones that don't enter into our state
                         transitions along with descriptions of each.
                     </para>
@@ -4232,47 +4230,7 @@ Host: servers.api.openstack.org/v2/
             </note>
         </section>
     </chapter>
-    <chapter xml:id="ext-compute" role="api-reference">
-        <title>Compute API v2 Extensions</title>
-        <para>Adds capabilities to the core Compute API. Use
-            extensions to add features, MIME types, actions, states,
-            headers, parameters, and resources to the core API. Query
-            the Compute API to list available extensions with a &GET;
-            request to v2/extensions.</para>
-        <section xml:id="ext-os-admin-actions">
-            <title>Server Admin Actions</title>
-            <para>Permits administrators to perform actions on a
-                server.</para>
-            <wadl:resources
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/compute-api/src/ext/os-admin-actions.wadl"
-                xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
-        </section>
-        <section xml:id="os-quota-sets">
-            <title>Quota Sets (os-quota-sets)</title>
-            <para>Permits administrators, depending on policy
-                settings, to view quotas for a tenant and view and
-                update default quotas.</para>
-            <wadl:resources
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/compute-api/src/ext/os-quota-sets.wadl"
-                xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
-        </section>
-        <section xml:id="os-security-groups">
-            <title>Security groups (os-security-groups)</title>
-            <para>Lists, shows information for, creates, and deletes
-                security groups.</para>
-            <wadl:resources
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/compute-api/src/ext/os-security-groups.wadl"
-                xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
-        </section>
-        <!-- Once https://review.openstack.org/#/c/55438/ is approved, uncomment the following: -->
-        <section xml:id="os-security-group-default-rules">
-            <title>Default security group rules
-                (os-security-group-default-rules)</title>
-            <para>Lists, shows information for, and creates default
-                security group rules.</para>
-            <wadl:resources
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/compute-api/src/ext/os-security-group-default-rules.wadl"
-                xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
-        </section>
-    </chapter>
+    <xi:include
+        href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/docbkx/ch_compute-ext.xml"
+    />
 </book>