diff --git a/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta-key.xml b/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta-key.xml index 1f2fd0d..870be7e 100644 --- a/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta-key.xml +++ b/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta-key.xml @@ -1,7 +1,7 @@ + name="new-server-test" imageId="1" flavorId="1"> Apache1 diff --git a/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta-value.xml b/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta-value.xml index 18710da..3bccf28 100644 --- a/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta-value.xml +++ b/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta-value.xml @@ -1,7 +1,7 @@ + name="new-server-test" imageId="1" flavorId="1"> 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 diff --git a/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta.xml b/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta.xml index e000c77..fd4b360 100644 --- a/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta.xml +++ b/openstack-compute-api-1.0/src/samples/server-post-req-bad-meta.xml @@ -1,7 +1,7 @@ + name="new-server-test" imageId="1" flavorId="1"> Apache1 Apache2 diff --git a/openstack-compute-api-1.0/src/samples/server.xml b/openstack-compute-api-1.0/src/samples/server.xml index 3d2ef00..ded08e0 100644 --- a/openstack-compute-api-1.0/src/samples/server.xml +++ b/openstack-compute-api-1.0/src/samples/server.xml @@ -1,11 +1,11 @@ + > Web Head 1 2.1 @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/openstack-compute-api-1.0/src/samples/servers.xml b/openstack-compute-api-1.0/src/samples/servers.xml index ff2f9aa..5512689 100644 --- a/openstack-compute-api-1.0/src/samples/servers.xml +++ b/openstack-compute-api-1.0/src/samples/servers.xml @@ -3,10 +3,10 @@ + imageId="1" flavorId="1" + status="BUILD" progress="60" + hostId="e4d909c290d0fb1ca068ffaddf22cbd0" + > Web Head 1 2.1 @@ -23,9 +23,9 @@ + imageId="1" flavorId="1" + status="ACTIVE" + hostId="9e107d9d372bb6826bd81d3542a419d6"> DB 1 diff --git a/openstack-compute-api-1.0/src/samples/version.xml b/openstack-compute-api-1.0/src/samples/version.xml index 478aafc..e4474e3 100644 --- a/openstack-compute-api-1.0/src/samples/version.xml +++ b/openstack-compute-api-1.0/src/samples/version.xml @@ -1,7 +1,7 @@ \ No newline at end of file + id="v1.0" + status="BETA" + docURL="http://docs.rackspacecloud.com/cs/cs-devguid-v1.0.pdf" + wadl="https://servers.api.rackspacecloud.com/v1.0/application.wadl"/> diff --git a/openstack-compute-api-2/src/xsd/actions.xsd b/openstack-compute-api-2/src/xsd/actions.xsd index d828c4d..41c3775 100644 --- a/openstack-compute-api-2/src/xsd/actions.xsd +++ b/openstack-compute-api-2/src/xsd/actions.xsd @@ -190,7 +190,7 @@ - + @@ -214,7 +214,7 @@ - + - - - + + + diff --git a/openstack-compute-api-2/src/xsd/api-common.xjb b/openstack-compute-api-2/src/xsd/api-common.xjb index 19b4e34..9ed57b5 100644 --- a/openstack-compute-api-2/src/xsd/api-common.xjb +++ b/openstack-compute-api-2/src/xsd/api-common.xjb @@ -1,11 +1,11 @@ - - - + xmlns:capi="http://docs.openstack.org/common/api/v1.0" version="2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd" + schemaLocation="api-common.xsd"> + + + diff --git a/openstack-compute-api-2/src/xsd/api.xjb b/openstack-compute-api-2/src/xsd/api.xjb index 78c006f..331635c 100644 --- a/openstack-compute-api-2/src/xsd/api.xjb +++ b/openstack-compute-api-2/src/xsd/api.xjb @@ -3,19 +3,19 @@ - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd" + schemaLocation="api.xsd"> + + + - - - - + + + + diff --git a/openstack-compute-api-2/src/xsd/atom.xjb b/openstack-compute-api-2/src/xsd/atom.xjb index c8cb5bb..1770dd7 100644 --- a/openstack-compute-api-2/src/xsd/atom.xjb +++ b/openstack-compute-api-2/src/xsd/atom.xjb @@ -5,7 +5,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd" schemaLocation="atom/atom.xsd"> - - - + + + diff --git a/openstack-compute-api-2/src/xsd/atom/xml.xsd b/openstack-compute-api-2/src/xsd/atom/xml.xsd index f65ef0c..bf83723 100644 --- a/openstack-compute-api-2/src/xsd/atom/xml.xsd +++ b/openstack-compute-api-2/src/xsd/atom/xml.xsd @@ -1,7 +1,7 @@ - http://www.w3.org/XML/1998/namespace.html and - http://www.w3.org/TR/REC-xml for information + http://www.w3.org/TR/REC-xml for information about this namespace.

@@ -36,7 +36,7 @@ They should not be used with conflicting semantics by any Working Group, specification, or document instance.

-

+

See further below in this document for more information about how to refer to this schema document from your own XSD schema documents and about the @@ -51,21 +51,21 @@

Notes

Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never - going to be a realistic possibility. + going to be a realistic possibility.

See BCP 47 at @@ -84,7 +84,7 @@ - + @@ -97,7 +97,7 @@

@@ -116,11 +116,11 @@ - +
- +

base (as an attribute name)

denotes an attribute whose value @@ -128,7 +128,7 @@ relative URIs in the scope of the element on which it appears; its value is inherited. This name is reserved by virtue of its definition in the XML Base specification.

- +

See http://www.w3.org/TR/xmlbase/ @@ -138,19 +138,19 @@ - +

- -

id (as an attribute name)

+ +

id (as an attribute name)

denotes an attribute whose value should be interpreted as if declared to be of type ID. This name is reserved by virtue of its definition in the xml:id specification.

- +

See http://www.w3.org/TR/xml-id/ @@ -171,22 +171,22 @@

- -

Father (in any context at all)

+ +

Father (in any context at all)

- denotes Jon Bosak, the chair of - the original XML Working Group. This name is reserved by - the following decision of the W3C XML Plenary and + denotes Jon Bosak, the chair of + the original XML Working Group. This name is reserved by + the following decision of the W3C XML Plenary and XML Coordination groups:

- In appreciation for his vision, leadership and - dedication the W3C XML Plenary on this 10th day of - February, 2000, reserves for Jon Bosak in perpetuity - the XML name "xml:Father". + In appreciation for his vision, leadership and + dedication the W3C XML Plenary on this 10th day of + February, 2000, reserves for Jon Bosak in perpetuity + the XML name "xml:Father".

@@ -263,27 +263,27 @@ Schema itself, or with the XML namespace itself. In other words, if the XML Schema or XML namespaces change, the version of this document at - http://www.w3.org/2001/xml.xsd - - will change accordingly; the version at + http://www.w3.org/2001/xml.xsd + + will change accordingly; the version at - http://www.w3.org/2009/01/xml.xsd - + http://www.w3.org/2009/01/xml.xsd + will not change.

- Previous dated (and unchanging) versions of this schema + Previous dated (and unchanging) versions of this schema document are at:

@@ -291,4 +291,3 @@ - diff --git a/openstack-compute-api-2/src/xsd/ext/rax-dme/api.xsd b/openstack-compute-api-2/src/xsd/ext/rax-dme/api.xsd index b9c7cfe..58d60cc 100644 --- a/openstack-compute-api-2/src/xsd/ext/rax-dme/api.xsd +++ b/openstack-compute-api-2/src/xsd/ext/rax-dme/api.xsd @@ -14,8 +14,7 @@ - diff --git a/openstack-compute-api-2/src/xsd/faults.xsd b/openstack-compute-api-2/src/xsd/faults.xsd index 863a9be..18a9412 100644 --- a/openstack-compute-api-2/src/xsd/faults.xsd +++ b/openstack-compute-api-2/src/xsd/faults.xsd @@ -445,7 +445,7 @@ - + - - + @@ -132,7 +132,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -258,7 +258,7 @@ - The ID of a version choice represents the service version's unique + The ID of a version choice represents the service version's unique identifier. This ID is guaranteed to be unique only among the service version choices outlined in the VersionChoiceList. @@ -299,12 +299,12 @@ - A MediaTypeList outlines a collection of valid media types for a given + A MediaTypeList outlines a collection of valid media types for a given service version. - + diff --git a/openstack-compute-api-2/src/xslt/schema.xsl b/openstack-compute-api-2/src/xslt/schema.xsl index d8bc7fe..40c6e8d 100644 --- a/openstack-compute-api-2/src/xslt/schema.xsl +++ b/openstack-compute-api-2/src/xslt/schema.xsl @@ -266,7 +266,7 @@ annotations: currently just xsdxt:code. --> - +