Permalink
Browse files

Refactor to demot the new method of putting extension

metadata in the book/info element and having
first chapter and ext_query.xml generated
from it.
  • Loading branch information...
dcramer
dcramer committed Mar 9, 2012
1 parent 71bc270 commit 544d28e19a4c688c15704245e684f1614e2ad0d9
Showing with 26 additions and 46 deletions.
  1. +1 −4 pom.xml
  2. +25 −2 src/docbkx/rax-rgn/rax-rgn.xml
  3. +0 −23 src/docbkx/rax-rgn/samples/ext_query.json
  4. +0 −17 src/docbkx/rax-rgn/samples/ext_query.xml
View
@@ -7,7 +7,7 @@
<name>Rackspace Compute Extensions</name>
<version>1.0.0-SNAPSHOT</version>
<properties>
- <doctools.version>1.0.8</doctools.version>
+ <doctools.version>1.0.12-SNAPSHOT</doctools.version>
</properties>
<dependencies>
@@ -173,9 +173,6 @@
<fileset dir="target/docbkx/pdf/rax-rgn">
<include name="**/*.pdf"/>
</fileset>
- <fileset dir="src/docbkx/rax-rgn/samples/">
- <include name="ext_query.xml"/>
- </fileset>
</copy>
</postProcess>
</configuration>
@@ -29,6 +29,7 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:m="http://www.w3.org/1998/Math/MathML"
xmlns:html="http://www.w3.org/1999/xhtml"
+ xml:id="rax-rgn"
version="5.0">
<title>OpenStack Compute Region Extension</title>
<titleabbrev>&ALIAS;</titleabbrev>
@@ -53,6 +54,28 @@
<remark>Copyright details are filled in by the template.</remark>
</annotation>
</legalnotice>
+ <othercredit>
+ <personname>
+ <firstname>Gabe</firstname>
+ <surname>Westmaas</surname>
+ </personname>
+ <email>gabe.westmaas@rackspace.com</email>
+ </othercredit>
+ <extensions xmlns="http://docs.openstack.org/common/api/v1.0"
+ xmlns:atom="http://www.w3.org/2005/Atom">
+ <extension name="Region Extension"
+ namespace="http://docs.rackspacecloud.com/servers/api/ext/region/v1.0"
+ alias="RAX-RGN" updated="2011-10-20T00:00:00">
+ <description>
+ Adds an attribute to the server that is used to
+ provide a hint as to the geographical region of server.
+ </description>
+ <atom:link rel="describedby" type="application/pdf"
+ href="http://docs.rackspacecloud.com/servers/api/ext/rax-rgn.pdf"/>
+ <atom:link rel="describedby" type="application/xml"
+ href="http://docs.rackspacecloud.com/servers/api/ext/rax-rgn/api.xsd"/>
+ </extension>
+ </extensions>
<abstract>
<para>
This document is intended for software developers interested
@@ -234,12 +257,12 @@
<?hard-pagebreak?>
<example xml:id="xmlserver">
<title>Server Detail Response: XML</title>
- <programlisting language="xml"><?db-font-size 95% ?><xi:include href="samples/rgn-server.xml" parse="text"/></programlisting>
+ <literallayout language="xml"><?db-font-size 95% ?><xi:include href="samples/rgn-server.xml" parse="text"/></literallayout>
</example>
<?hard-pagebreak?>
<example xml:id="jsonserver">
<title>Server Detail Response: JSON</title>
- <programlisting language="javascript"><?db-font-size 90%?><xi:include href="samples/rgn-server.json" parse="text"/></programlisting>
+ <literallayout language="javascript"><?db-font-size 90%?><xi:include href="samples/rgn-server.json" parse="text"/></literallayout>
</example>
</section>
</section>
@@ -1,23 +0,0 @@
-{
- "extensions": [
- {
- "name": "Region Extension",
- "namespace": "http://docs.rackspacecloud.com/servers/api/ext/region/v1.0",
- "alias": "RAX-RGN",
- "updated": "2011-10-20T00:00:00",
- "description": "Adds an attribute to the server that is used to provide a hint as to the geographical region of server.",
- "links": [
- {
- "rel": "describedby",
- "type": "application/pdf",
- "href": "http://docs.rackspacecloud.com/servers/api/ext/rax-rgn.pdf"
- },
- {
- "rel": "describedby",
- "type": "application/xml",
- "href": "http://docs.rackspacecloud.com/servers/api/ext/rax-rgn/api.xsd"
- }
- ]
- }
- ]
-}
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<extensions xmlns="http://docs.openstack.org/common/api/v1.0"
- xmlns:atom="http://www.w3.org/2005/Atom">
- <extension name="Region Extension"
- namespace="http://docs.rackspacecloud.com/servers/api/ext/region/v1.0"
- alias="RAX-RGN" updated="2011-10-20T00:00:00">
- <description>
- Adds an attribute to the server that is used to
- provide a hint as to the geographical region of server.
- </description>
- <atom:link rel="describedby" type="application/pdf"
- href="http://docs.rackspacecloud.com/servers/api/ext/rax-rgn.pdf"/>
- <atom:link rel="describedby" type="application/xml"
- href="http://docs.rackspacecloud.com/servers/api/ext/rax-rgn/api.xsd"/>
- </extension>
-</extensions>

0 comments on commit 544d28e

Please sign in to comment.