Changes to support roles and baseurls on wadl.

17 files changed, 231 insertions, 104 deletions

diff --git a/docs/guide/src/docbkx/samples/auth.json b/docs/guide/src/docbkx/samples/auth.json
index fa56c131..b5fbada2 100644
--- a/docs/guide/src/docbkx/samples/auth.json
+++ b/docs/guide/src/docbkx/samples/auth.json
@@ -1,19 +1,37 @@
 {
-  "auth" :  {
-      "token": {
-          "id": "ab48a9efdfedb23ty3494",
-          "expires": "2010-11-01T03:32:15-05:00"
-      },
-      "user" : {
-          "groups": {
-              "group": [
-                  {
-                      "tenantId" : "1234",
-                      "id": "Admin"
-                  }
-              ]},
-          "username": "jqsmith",
-          "tenantId": "1234"
-      }
-  }
+    "auth" : {
+        "token" : {
+            "id" : "asdasdasd-adsasdads-asdasdasd-adsadsasd",
+            "expires" : "2010-11-01T03:32:15-05:00"
+        },
+        "serviceCatalog" : {
+            "service1" : [
+                {
+                    "region" : "DFW",
+                    "publicURL" : "https://service1-public/v1/blah-blah",
+                    "internalURL" : "https://service1-internal/v1/blah-blah"
+                },
+                {
+                    "region" : "ORD",
+                    "publicURL" : "https://service1-public-ord/v1/blah-blah",
+                    "internalURL" : "https://service1-internal-ord/v1/blah-blah"
+                }
+            ],
+            "service2" : [
+                {
+                    "region" : "DFW",
+                    "publicURL" : "https://service2-public-dfw/v1/blah-blah",
+                },
+                {
+                    "region" : "ORD",
+                    "publicURL" : "https://service2-public-orf/v1/blah-blah",
+                }
+            ],
+            "service3" : [
+                {
+                    "publicURL" : "https://service3-public/v1/blah-blah",
+                }
+            ]
+        }
+    }
 }
diff --git a/docs/guide/src/docbkx/samples/auth.xml b/docs/guide/src/docbkx/samples/auth.xml
index 0e114a64..6d90c064 100644
--- a/docs/guide/src/docbkx/samples/auth.xml
+++ b/docs/guide/src/docbkx/samples/auth.xml
@@ -2,9 +2,28 @@
 <auth xmlns="http://docs.openstack.org/identity/api/v2.0">
 	<token expires="2010-11-01T03:32:15-05:00"
            id="ab48a9efdfedb23ty3494"/>
-	<user tenantId="1245" username="jqsmith">
-	    <groups>
-	        <group tenantId="1245" id="Admin"/>
-	    </groups>
-	</user>
+    <serviceCatalog>
+        <service name="service1">
+            <endpoint
+                    region="DFW"
+                    publicURL="https://service1.public.com/v2.0/blah-blah"
+                    internalURL="https://service1.internal.com/v2.0/blah-blah"/>
+            <endpoint
+                    region="ORD"
+                    publicURL="https://service1.public.com/v2.0/blah-blah"
+                    internalURL="https://service1.internal.com/v2.0/blah-blah"/>
+        </service>
+        <service name="service2">
+            <endpoint
+                    region="DFW"
+                    publicURL="https://service2.public.com/v2.0/blah-blah"/>
+            <endpoint
+                    region="ORD"
+                    publicURL="https://service2.public.com/v2.0/blah-blah"/>
+        </service>
+        <service name="service3">
+            <endpoint
+                    publicURL="https://service3.public.com/v2.0/blah-blah"/>
+        </service>
+    </serviceCatalog>
 </auth>
diff --git a/docs/guide/src/docbkx/samples/baseURL.json b/docs/guide/src/docbkx/samples/baseURL.json
index c07d943c..534484aa 100644
--- a/docs/guide/src/docbkx/samples/baseURL.json
+++ b/docs/guide/src/docbkx/samples/baseURL.json
@@ -2,12 +2,11 @@
   "baseURL" :
    {
        "id" : 1,
-       "userType" : "NAST",
        "region"   : "DFW",
        "default"  : true,
-       "serviceName" : "cloudFiles",
-       "publicURL" : "https://storage.clouddrive.com/v1",
-       "internalURL" : "https://storage-snet.clouddrive.com/v1",
+       "serviceName" : "service1",
+       "publicURL" : "https://service-public.com/v1",
+       "internalURL" : "https://service-internal.com/v1",
        "enabled"  : true
    }
 }
diff --git a/docs/guide/src/docbkx/samples/baseURL.xml b/docs/guide/src/docbkx/samples/baseURL.xml
index 415fbf10..a66d5516 100644
--- a/docs/guide/src/docbkx/samples/baseURL.xml
+++ b/docs/guide/src/docbkx/samples/baseURL.xml
@@ -3,11 +3,10 @@
 <baseURL
   xmlns="http://docs.openstack.org/identity/api/v2.0"
   id="1" 
-  userType="NAST" 
   region="DFW" 
   default="true"
-  serviceName="cloudFiles"
-  publicURL="https://storage.clouddrive.com/v1"
-  internalURL="https://storage-snet.clouddrive.com/v1" 
+  serviceName="service1"
+  publicURL="https://service-public.com/v1"
+  internalURL="https://service-internal.com/v1" 
   enabled="true"
  />
diff --git a/docs/guide/src/docbkx/samples/baseURLRef.json b/docs/guide/src/docbkx/samples/baseURLRef.json
index 4e0cd4b2..aed01500 100644
--- a/docs/guide/src/docbkx/samples/baseURLRef.json
+++ b/docs/guide/src/docbkx/samples/baseURLRef.json
@@ -1,6 +1,5 @@
 {
     "baseURLRef" : {
-        "id" : 3,
-        "v1Default" : true
+        "id" : 3
     }
 }
diff --git a/docs/guide/src/docbkx/samples/baseURLRef.xml b/docs/guide/src/docbkx/samples/baseURLRef.xml
index b9dc8c46..16c71870 100644
--- a/docs/guide/src/docbkx/samples/baseURLRef.xml
+++ b/docs/guide/src/docbkx/samples/baseURLRef.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <baseURLRef xmlns="http://docs.openstack.org/identity/api/v2.0"
-            id="3" v1Default="true"/>
+            id="3" />
diff --git a/docs/guide/src/docbkx/samples/baseURLRefs.json b/docs/guide/src/docbkx/samples/baseURLRefs.json
index 30e56d45..a815f2b9 100644
--- a/docs/guide/src/docbkx/samples/baseURLRefs.json
+++ b/docs/guide/src/docbkx/samples/baseURLRefs.json
@@ -2,26 +2,23 @@
  "baseURLRefs" : [
   {
   "id" : 1,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/1",
-  "v1Default" : true
+  "href" : "https://auth.keystone.com/v2.0/baseURLs/1"
   },
   {
-  "id" : 2,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/2"
+  "id" : 2
+  "href" : "https://auth.keystone.com/v2.0/baseURLs/2"
   },
   {
   "id" : 3,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/3",
-  "v1Default" : true
+  "href" : "https://auth.keystone.com/v2.0/baseURLs/3"
   },
   {
   "id" : 4,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/4"
+  "href" : "https://auth.keystone.com/v2.0/baseURLs/4"
   },
   {
   "id" : 5,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/5",
-  "v1Default" : true
+  "href" : "https://auth.keystone.com/v2.0/baseURLs/5"
   }
  ]
 }
diff --git a/docs/guide/src/docbkx/samples/baseURLRefs.xml b/docs/guide/src/docbkx/samples/baseURLRefs.xml
index 51029ff5..0c095626 100644
--- a/docs/guide/src/docbkx/samples/baseURLRefs.xml
+++ b/docs/guide/src/docbkx/samples/baseURLRefs.xml
@@ -3,18 +3,18 @@
 <baseURLRefs
     xmlns="http://docs.openstack.org/identity/api/v2.0">
   <baseURLRef
-      href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/1"
-      id="1"  v1Default="true" />
+      href="https://auth.keystone.com/v2.0/baseURLs/1"
+      id="1" />
   <baseURLRef
-      href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/2"
+      href="https://auth.keystone.com/v2.0/baseURLs/2"
       id="2" />
   <baseURLRef
-      href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/3"
-      id="3" v1Default="true" />
+      href="https://auth.keystone.com/v2.0/baseURLs/3"
+      id="3" />
   <baseURLRef
-      href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/4"
+      href="https://auth.keystone.com/v2.0/baseURLs/4"
       id="4" />
   <baseURLRef
-      href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/5"
-      id="5" v1Default="true" />
+      href="https://auth.keystone.com/v2.0/baseURLs/5"
+      id="5" />
 </baseURLRefs>
diff --git a/docs/guide/src/docbkx/samples/baseURLs.json b/docs/guide/src/docbkx/samples/baseURLs.json
index 58b5bd24..da3d1d14 100644
--- a/docs/guide/src/docbkx/samples/baseURLs.json
+++ b/docs/guide/src/docbkx/samples/baseURLs.json
@@ -2,46 +2,41 @@
  "baseURLs" : [
      {
      "id" : 1,
-     "userType" : "NAST",
      "region"   : "DFW",
      "default"  : true,
-     "serviceName" : "cloudFiles",
-     "publicURL" : "https://storage.clouddrive.com/v1",
-     "internalURL" : "https://storage-snet.clouddrive.com/v1",
+     "serviceName" : "service1",
+     "publicURL" : "https://service1.public.com/v1",
+     "internalURL" : "https://service1.internal.com/v1",
      "enabled"  : true
      },
      {
      "id" : 2,
-     "userType" : "NAST",
      "region"   : "ORD",
-     "serviceName" : "cloudFiles",
-     "publicURL" : "https://otherstorage.clouddrive.com/v1",
-     "internalURL" : "https://otherstorage-snet.clouddrive.com/v1",
+     "serviceName" : "service2",
+     "publicURL" : "https://service2.public.com/v1",
+     "internalURL" : "https://service2.internal.com/v1",
      "enabled"  : false
      },
      {
      "id" : 3,
-     "userType" : "NAST",
      "region"   : "DFW",
      "default"  : true,
-     "serviceName" : "cloudFilesCDN",
-     "publicURL" : "https://cdn.clouddrive.com/v1",
+     "serviceName" : "service1",
+     "publicURL" : "https://service.public.com/v1",
      "enabled"  : true
      },
      {
      "id" : 4,
-     "userType" : "NAST",
      "region"   : "ORD",
-     "serviceName" : "cloudFilesCDN",
-     "publicURL" : "https://othercdn.clouddrive.com/v1",
+     "serviceName" : "service2",
+     "publicURL" : "https://service2.public.com/v1",
      "enabled"  : true
      },
      {
      "id" : 5,
-     "userType" : "MOSSO",
      "default"  : true,
-     "serviceName" : "cloudServers",
-     "publicURL" : "https://servers.api.rackspacecloud.com/v1.0",
+     "serviceName" : "service3",
+     "publicURL" : "https://service3.public.com/v1.0",
      "enabled"  : true
      }
  ]
diff --git a/docs/guide/src/docbkx/samples/baseURLs.xml b/docs/guide/src/docbkx/samples/baseURLs.xml
index 0faa3a5b..9f829e9d 100644
--- a/docs/guide/src/docbkx/samples/baseURLs.xml
+++ b/docs/guide/src/docbkx/samples/baseURLs.xml
@@ -3,45 +3,40 @@
 <baseURLs xmlns="http://docs.openstack.org/identity/api/v2.0">
   <baseURL
    id="1" 
-   userType="NAST" 
    region="DFW" 
    default="true"
-   serviceName="cloudFiles"
-   publicURL="https://storage.clouddrive.com/v1"
-   internalURL="https://storage-snet.clouddrive.com/v1" 
+   serviceName="service1"
+   publicURL="https://service1.public.com/v1"
+   internalURL="https://service1.internal.clouddrive.com/v1" 
    enabled="true"
   />
   <baseURL
    id="2" 
-   userType="NAST" 
    region="ORD"
-   serviceName="cloudFiles"
-   publicURL="https://otherstorage.clouddrive.com/v1"
-   internalURL="https://otherstorage-snet.clouddrive.com/v1" 
+   serviceName="service2"
+   publicURL="https://service2.public.com/v1"
+   internalURL="https://service2.internal.public.com/v1" 
    enabled="false"
   />
   <baseURL
    id="3" 
-   userType="NAST" 
    region="DFW" 
    default="true"
-   serviceName="cloudFilesCDN"
-   publicURL="https://cdn.clouddrive.com/v1" 
+   serviceName="service1"
+   publicURL="https://service1.public.com/v1" 
    enabled="true"
   />
   <baseURL
    id="4" 
-   userType="NAST" 
    region="ORD"
-   serviceName="cloudFilesCDN"
-   publicURL="https://othercdn.clouddrive.com/v1" 
+   serviceName="service2"
+   publicURL="https://service2.public.com/v1" 
    enabled="true"
   />
   <baseURL
    id="5" 
-   userType="MOSSO" 
    default="true"
-   serviceName="cloudServers"
-   publicURL="https://servers.api.rackspacecloud.com/v1.0" 
+   serviceName="service3"
+   publicURL="https://service3.public.com/v1" 
   />
 </baseURLs>
diff --git a/docs/guide/src/docbkx/samples/roleRefs.json b/docs/guide/src/docbkx/samples/roleRefs.json
index d815a19a..77819d44 100644
--- a/docs/guide/src/docbkx/samples/roleRefs.json
+++ b/docs/guide/src/docbkx/samples/roleRefs.json
@@ -2,13 +2,13 @@
  "roleRefs" : [
   {
   	"id" : 1,
-  	"href" : "https://.openstack.org/identity/v1.1/roles/admin",
+  	"href" : "https://.openstack.org/identity/v2.0/roles/admin",
   	"tenantId" : "one"
   },
   {
   	"id" : 2,
-  	"href" : "https://.openstack.org/identity/v1.1/roles/test",
+  	"href" : "https://.openstack.org/identity/v2.0/roles/test",
   	"tenantId" : "two"
-  },
+  }
  ]
 }
diff --git a/docs/guide/src/docbkx/samples/roleRefs.xml b/docs/guide/src/docbkx/samples/roleRefs.xml
index 36906df4..284154ce 100644
--- a/docs/guide/src/docbkx/samples/roleRefs.xml
+++ b/docs/guide/src/docbkx/samples/roleRefs.xml
@@ -3,7 +3,7 @@
 <roleRefs
     xmlns="http://docs.openstack.org/identity/api/v2.0">
     <roleRef xmlns="http://docs.openstack.org/identity/api/v2.0"
-                href="https://.openstack.org/identity/v1.1/roles/admin" id="3" tenantId="tenantId"/>
+                href="https://.openstack.org/identity/v2.0/roles/admin" id="3" tenantId="tenantId"/>
     <roleRef xmlns="http://docs.openstack.org/identity/api/v2.0"
-                href="https://.openstack.org/identity/v1.1/roles/test" id="4" tenantId="tenantId"/>
+                href="https://.openstack.org/identity/v2.0/roles/test" id="4" tenantId="tenantId"/>
 </roleRefs>                
diff --git a/docs/guide/src/docbkx/samples/roles.xml b/docs/guide/src/docbkx/samples/roles.xml
index 32073f63..89ba8d73 100644
--- a/docs/guide/src/docbkx/samples/roles.xml
+++ b/docs/guide/src/docbkx/samples/roles.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <roles xmlns="http://docs.openstack.org/identity/api/v2.0">
-  <role
-   id="4" 
-   serviceName="cloudFilesCDN"
-  />
-  <role
-   id="5" 
-   serviceName="cloudServers"
-  />
+ <role id="4" serviceName="cloudFilesCDN" />
+ <role id="5" serviceName="cloudServers" />
 </roles>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/validatetoken.json b/docs/guide/src/docbkx/samples/validatetoken.json
index c4721873..6c9f16f9 100644
--- a/docs/guide/src/docbkx/samples/validatetoken.json
+++ b/docs/guide/src/docbkx/samples/validatetoken.json
@@ -12,6 +12,14 @@
                       "name": "Admin"
                   }
               ]},
+           "roleRefs": {   
+	           "roleRef" : [
+                  {
+                      "id" : 1,
+                      "href" : "https://.openstack.org/identity/v2.0/roles/admin",
+                      "tenantId" : "one"
+                  }
+              ]},   
           "username": "jqsmith",
           "tenantId": "1234",
       }
diff --git a/docs/guide/src/docbkx/samples/validatetoken.xml b/docs/guide/src/docbkx/samples/validatetoken.xml
index e04742ae..af40a8b6 100644
--- a/docs/guide/src/docbkx/samples/validatetoken.xml
+++ b/docs/guide/src/docbkx/samples/validatetoken.xml
@@ -6,5 +6,9 @@
 	    <groups>
 	        <group tenantId="1245" name="Admin"/>
 	    </groups>
+       <roleRefs>
+           <roleRef href="https://.openstack.org/identity/v2.0/roles/admin" id="3" tenantId="tenantId"/>
+           <roleRef href="https://.openstack.org/identity/v2.0/roles/test" id="4" tenantId="tenantId"/>
+       </roleRefs>        
 	</user>
 </auth>
diff --git a/docs/guide/src/docbkx/xsd/roles.xsd b/docs/guide/src/docbkx/xsd/roles.xsd
index 4ae8449b..1bcd2cda 100644
--- a/docs/guide/src/docbkx/xsd/roles.xsd
+++ b/docs/guide/src/docbkx/xsd/roles.xsd
@@ -65,6 +65,13 @@
         <attribute name="service" type="xsd:string"  use="optional"/>
     </complexType>
     
+    <complexType name="RoleList">
+        <sequence>
+            <element name="role" type="idm:Role" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    
+    
     <complexType name="RoleRef">
         <attribute name="id" type="xsd:int" use="required"/>
         <attribute name="tenantId" type="xsd:string" use="required" />
@@ -81,11 +88,6 @@
         </attribute>
     </complexType>
     
-    <complexType name="RoleList">
-        <sequence>
-            <element name="role" type="idm:Role" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
 
     <complexType name="RoleRefList">
         <sequence>
diff --git a/docs/guide/src/docbkx/xsd/token.xsd b/docs/guide/src/docbkx/xsd/token.xsd
index 888bbebf..5e9aae46 100644
--- a/docs/guide/src/docbkx/xsd/token.xsd
+++ b/docs/guide/src/docbkx/xsd/token.xsd
@@ -8,6 +8,7 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
+    <include schemaLocation="roles.xsd"/>
     <!-- Elements -->
     <element name="passwordCredentials" type="identity:PasswordCredentials"/>
     <element name="auth" type="identity:AuthData"/>
@@ -32,11 +33,12 @@
         <sequence>
             <element name="token" type="identity:Token"/>
             <element name="user" type="identity:User"/>
+            <element name="serviceCatalog" type="identity:ServiceCatalog"/>
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
-
+    
     <complexType name="Token">
         <sequence>
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
@@ -49,6 +51,7 @@
     <complexType name="User">
         <sequence>
             <element name="groups" type="identity:Groups" />
+            <element name="roleRefs" type="identity:RoleRefList" />
             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <attribute name="tenantId" type="xsd:string"/>
@@ -63,10 +66,105 @@
         </sequence>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
-
+    
     <complexType name="Group">
         <attribute name="id" type="xsd:string" use="required"/>
         <attribute name="tenantId" type="xsd:string"  use="optional"/>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
+    
+    <complexType name="ServiceCatalog">
+        <sequence>
+            <element name="service" type="identity:Service" minOccurs="1" maxOccurs="unbounded">
+                <annotation>
+                    <xsd:documentation
+                            xml:lang="EN"
+                            xmlns="http://www.w3.org/1999/xhtml">
+                        <p>
+                            A list of services.
+                        </p>
+                    </xsd:documentation>
+                </annotation>
+            </element>
+        </sequence>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <complexType name="Service">
+        <sequence>
+            <element name="endpoint" type="identity:Endpoint" minOccurs="1" maxOccurs="unbounded">
+                <annotation>
+                    <xsd:documentation
+                            xml:lang="EN"
+                            xmlns="http://www.w3.org/1999/xhtml">
+                        <p>
+                            A list of endpoints.
+                        </p>
+                    </xsd:documentation>
+                </annotation>
+            </element>
+        </sequence>
+        <attribute name="name" type="xsd:ID" use="required">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        The service name.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <complexType name="Endpoint">
+        <attribute name="region" type="xsd:string" use="optional">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        The airport code of the region where the endpoint
+                        lives.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <attribute name="publicURL" type="xsd:anyURI" use="required">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        The publically accessible service URL.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <attribute name="internalURL" type="xsd:anyURI" use="optional">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        A service URL, accessible only within the
+                        Rackspace Cloud.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <attribute name="adminURL" type="xsd:anyURI" use="optional">
+            <annotation>
+                <xsd:documentation
+                        xml:lang="EN"
+                        xmlns="http://www.w3.org/1999/xhtml">
+                    <p>
+                        A service URL used for administration. This may expose
+                        additional functionality not found in the public and
+                        internal URL.
+                    </p>
+                </xsd:documentation>
+            </annotation>
+        </attribute>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
 </schema>