Merge remote branch 'rackspace/master'

20 files changed, 86 insertions, 165 deletions

diff --git a/docs/guide/src/docbkx/identity.wadl b/docs/guide/src/docbkx/identity.wadl
index cade9c07..4b68f9a7 100644
--- a/docs/guide/src/docbkx/identity.wadl
+++ b/docs/guide/src/docbkx/identity.wadl
@@ -7,7 +7,7 @@
              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
              xsi:schemaLocation="http://docs.openstack.org/identity/api/v2.0
                                  xsd/api.xsd
-                                 http://docs.openstack.org/common/api/v2.0
+                                 http://docs.openstack.org/common/api/v1.0
                                  xsd/api-common.xsd
                                  ">
 
diff --git a/docs/guide/src/docbkx/identitydevguide.xml b/docs/guide/src/docbkx/identitydevguide.xml
index 6303efaa..cb67b683 100644
--- a/docs/guide/src/docbkx/identitydevguide.xml
+++ b/docs/guide/src/docbkx/identitydevguide.xml
@@ -60,7 +60,7 @@
 	</copyright>
 	<releaseinfo>API v2.0</releaseinfo>
 	<productname>Keystone - OpenStack Identity</productname>
-	<pubdate>2011-04-23</pubdate>
+	<pubdate>2011-05-27</pubdate>
 	<legalnotice role="apache2">
 		<annotation>
 			<remark>Copyright details are filled in by the template.</remark>
@@ -136,10 +136,9 @@
 	<section>
 		<title>Group</title>
 		<para>
-			A group of users. Global groups are managed by
-			operators. They are used to organize and assign privileges
-			to a group of related users. For example, an operator may
-			create a "delinquent" group, which will assign limited
+			A group of users. Groups may be used to organize and assign
+            privileges to a group of related users. For example, an operator
+            may create a "delinquent" group, which will assign limited
 			privileges to users who have past due bills.
 		</para>
 	</section>
diff --git a/docs/guide/src/docbkx/samples/baseURLs.json b/docs/guide/src/docbkx/samples/baseURLs.json
index da3d1d14..36ec4f6e 100644
--- a/docs/guide/src/docbkx/samples/baseURLs.json
+++ b/docs/guide/src/docbkx/samples/baseURLs.json
@@ -22,21 +22,21 @@
      "region"   : "DFW",
      "default"  : true,
      "serviceName" : "service1",
-     "publicURL" : "https://service.public.com/v1",
+     "publicURL" : "https://service.public.com/v1.0",
      "enabled"  : true
      },
      {
      "id" : 4,
      "region"   : "ORD",
      "serviceName" : "service2",
-     "publicURL" : "https://service2.public.com/v1",
+     "publicURL" : "https://service2.public.com/v2",
      "enabled"  : true
      },
      {
      "id" : 5,
      "default"  : true,
      "serviceName" : "service3",
-     "publicURL" : "https://service3.public.com/v1.0",
+     "publicURL" : "https://service3.public.com/v3.2",
      "enabled"  : true
      }
  ]
diff --git a/docs/guide/src/docbkx/samples/choices.json b/docs/guide/src/docbkx/samples/choices.json
index b6f31fa1..16ec35f0 100644
--- a/docs/guide/src/docbkx/samples/choices.json
+++ b/docs/guide/src/docbkx/samples/choices.json
@@ -47,7 +47,7 @@
             },
             {
                 "id" : "v2.0",
-                "status" : "CURRENT",
+                "status" : "BETA",
                 "links": [
                     {
                         "rel" : "self",
diff --git a/docs/guide/src/docbkx/samples/choices.xml b/docs/guide/src/docbkx/samples/choices.xml
index 9d1e8ffb..134c9d00 100644
--- a/docs/guide/src/docbkx/samples/choices.xml
+++ b/docs/guide/src/docbkx/samples/choices.xml
@@ -1,29 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<choices xmlns="http://docs.openstack.org/common/api/v1.0" 
-         xmlns:atom="http://www.w3.org/2005/Atom">
+<choices xmlns="http://docs.openstack.org/common/api/v2.0" 
+		 xmlns:atom="http://www.w3.org/2005/Atom">
 
- <version id="v1.0" status="DEPRECATED">
-     <media-types>
-         <media-type base="application/xml"
-            type="application/vnd.openstack.identity-v2.0+xml"/>
-         <media-type base="application/json"
-            type="application/vnd.openstack.identity-v2.0+json"/>
-     </media-types>
-        
-     <atom:link rel="self"
-                href="http://identity.api.openstack.org/v2.0"/>
-    </version>
-    
-    <version id="v1.1" status="CURRENT">
-     <media-types>
-         <media-type base="application/xml"
-            type="application/vnd.openstack.identity-v1.1+xml"/>
-         <media-type base="application/json"
-            type="application/vnd.openstack.identity-v1.1+json"/>
-     </media-types>
-        
-     <atom:link rel="self"
-                href="http://identity.api.openstack.org/v1.1"/>
-    </version>
+    <version id="v1.0" status="DEPRECATED">
+	 <media-types>
+		 <media-type base="application/xml"
+			type="application/vnd.openstack.identity-v1.0+xml"/>
+		 <media-type base="application/json"
+			type="application/vnd.openstack.identity-v1.0+json"/>
+	 </media-types>
+		
+	 <atom:link rel="self"
+				href="http://identity.api.openstack.org/v1.0"/>
+	</version>
+	
+	<version id="v1.1" status="CURRENT">
+	 <media-types>
+		 <media-type base="application/xml"
+			type="application/vnd.openstack.identity-v1.1+xml"/>
+		 <media-type base="application/json"
+			type="application/vnd.openstack.identity-v1.1+json"/>
+	 </media-types>
+
+	 <atom:link rel="self"
+				href="http://identity.api.openstack.org/v1.1"/>
+	</version>
+	
+	<version id="v2.0" status="BETA">
+	 <media-types>
+		 <media-type base="application/xml"
+			type="application/vnd.openstack.identity-v2.0+xml"/>
+		 <media-type base="application/json"
+			type="application/vnd.openstack.identity-v2.0+json"/>
+	 </media-types>
+	 
+	 <atom:link rel="self"
+				href="http://identity.api.openstack.org/v2.0"/>
+	</version>
 </choices>
diff --git a/docs/guide/src/docbkx/samples/extensions.json b/docs/guide/src/docbkx/samples/extensions.json
index 553c892e..da3cbc50 100644
--- a/docs/guide/src/docbkx/samples/extensions.json
+++ b/docs/guide/src/docbkx/samples/extensions.json
@@ -3,7 +3,7 @@
         "values" : [
             {
                 "name" : "Reset Password Extension",
-                "namespace" : "http://docs.rackspacecloud.com/identity/api/ext/rpe/v1.0",
+                "namespace" : "http://docs.rackspacecloud.com/identity/api/ext/rpe/v2.0",
                 "alias" : "RS-RPE",
                 "updated" : "2011-01-22T13:25:27-06:00",
                 "description" : "Adds the capability to reset a user's password. The user is emailed when the password has been reset.",
diff --git a/docs/guide/src/docbkx/samples/getuser-1.json b/docs/guide/src/docbkx/samples/getuser-1.json
index f9afcbd8..bef6c9a7 100644
--- a/docs/guide/src/docbkx/samples/getuser-1.json
+++ b/docs/guide/src/docbkx/samples/getuser-1.json
@@ -17,7 +17,7 @@
           "links" : [
               {
                   "rel"  : "next",
-                  "href" : "http://identity.api.openstack.org/v2.0/1234/tenants/1234/users/jqsmith/groups?marker=Super"
+                  "href" : "http://identity.api.openstack.org/v2.0/tenants/1234/users/jqsmith/groups?marker=Super"
               }
           ]
       },
diff --git a/docs/guide/src/docbkx/samples/getuser-1.xml b/docs/guide/src/docbkx/samples/getuser-1.xml
index 37c67ad7..cc0f5fc6 100644
--- a/docs/guide/src/docbkx/samples/getuser-1.xml
+++ b/docs/guide/src/docbkx/samples/getuser-1.xml
@@ -9,6 +9,6 @@
         <group id="Super"/>
         <atom:link
             rel="next"
-            href="http://identity.api.openstack.org/v2.0/1234/tenants/1234/users/jqsmith/groups?marker=Super"/>
+            href="http://identity.api.openstack.org/v2.0/tenants/1234/users/jqsmith/groups?marker=Super"/>
     </groups>
 </user>
diff --git a/docs/guide/src/docbkx/samples/tenants-1.json b/docs/guide/src/docbkx/samples/tenants-1.json
index eb3f1430..c80050a4 100644
--- a/docs/guide/src/docbkx/samples/tenants-1.json
+++ b/docs/guide/src/docbkx/samples/tenants-1.json
@@ -10,7 +10,7 @@
     "links" : [
         {
             "rel" : "next",
-            "href" : "http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&marker=1234"
+            "href" : "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"
         }
     ]
 }
diff --git a/docs/guide/src/docbkx/samples/tenants-1.xml b/docs/guide/src/docbkx/samples/tenants-1.xml
index 98786864..18fcbfd3 100644
--- a/docs/guide/src/docbkx/samples/tenants-1.xml
+++ b/docs/guide/src/docbkx/samples/tenants-1.xml
@@ -6,5 +6,5 @@
     </tenant>
     <atom:link
         rel="next"
-        href="http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&amp;marker=1234"/>
+        href="http://identity.api.openstack.org/v2.0/tenants?limit=1&amp;marker=1234"/>
 </tenants>
diff --git a/docs/guide/src/docbkx/samples/tenants-2.json b/docs/guide/src/docbkx/samples/tenants-2.json
index 6d48ad23..d1fcae35 100644
--- a/docs/guide/src/docbkx/samples/tenants-2.json
+++ b/docs/guide/src/docbkx/samples/tenants-2.json
@@ -10,11 +10,11 @@
     "links" : [
         {
             "rel" : "next",
-            "href" : "http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&marker=3645"
+            "href" : "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=3645"
         },
         {
             "rel" : "previous",
-            "href" : "http://identity.api.openstack.org/v2.0/1234/tenants?limit=1"
+            "href" : "http://identity.api.openstack.org/v2.0/tenants?limit=1"
         }
     ]
 }
diff --git a/docs/guide/src/docbkx/samples/tenants-2.xml b/docs/guide/src/docbkx/samples/tenants-2.xml
index 42cc0a18..4ad53477 100644
--- a/docs/guide/src/docbkx/samples/tenants-2.xml
+++ b/docs/guide/src/docbkx/samples/tenants-2.xml
@@ -6,8 +6,8 @@
     </tenant>
     <atom:link
         rel="previous"
-        href="http://identity.api.openstack.org/v2.0/1234/tenants?limit=1"/>
+        href="http://identity.api.openstack.org/v2.0/tenants?limit=1"/>
     <atom:link
         rel="next"
-        href="http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&amp;marker=3645"/>
+        href="http://identity.api.openstack.org/v2.0/tenants?limit=1&amp;marker=3645"/>
 </tenants>
diff --git a/docs/guide/src/docbkx/samples/tenants-3.json b/docs/guide/src/docbkx/samples/tenants-3.json
index f9030f2e..72948804 100644
--- a/docs/guide/src/docbkx/samples/tenants-3.json
+++ b/docs/guide/src/docbkx/samples/tenants-3.json
@@ -10,7 +10,7 @@
     "links" : [
         {
             "rel" : "previous",
-            "href" : "http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&marker=1234"
+            "href" : "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"
         }
     ]
 }
diff --git a/docs/guide/src/docbkx/samples/tenants-3.xml b/docs/guide/src/docbkx/samples/tenants-3.xml
index 89f29370..7bbd88a7 100644
--- a/docs/guide/src/docbkx/samples/tenants-3.xml
+++ b/docs/guide/src/docbkx/samples/tenants-3.xml
@@ -6,5 +6,5 @@
     </tenant>
     <atom:link
         rel="previous"
-        href="http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&amp;marker=1234"/>
+        href="http://identity.api.openstack.org/v2.0/tenants?limit=1&amp;marker=1234"/>
 </tenants>
diff --git a/docs/guide/src/docbkx/samples/validatetoken.json b/docs/guide/src/docbkx/samples/validatetoken.json
index 6c9f16f9..6906991a 100644
--- a/docs/guide/src/docbkx/samples/validatetoken.json
+++ b/docs/guide/src/docbkx/samples/validatetoken.json
@@ -21,7 +21,7 @@
                   }
               ]},   
           "username": "jqsmith",
-          "tenantId": "1234",
+          "tenantId": "1234"
       }
   }
 }
diff --git a/docs/guide/src/docbkx/samples/version-atom.xml b/docs/guide/src/docbkx/samples/version-atom.xml
index 519ab203..004a5444 100644
--- a/docs/guide/src/docbkx/samples/version-atom.xml
+++ b/docs/guide/src/docbkx/samples/version-atom.xml
@@ -3,7 +3,7 @@
   <title type="text">About This Version</title>
   <updated>2011-01-21T11:33:21-06:00</updated>
   <id>http://identity.api.openstack.org/v2.0/</id>
-   <author><name>Rackspace</name><uri>http://www.rackspace.com/</uri></author>
+   <author><name>OpenStack</name><uri>http://www.openstack.org/</uri></author>
    <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
    <entry>
       <id>http://identity.api.openstack.org/v2.0/</id>
diff --git a/docs/guide/src/docbkx/samples/versions-atom.xml b/docs/guide/src/docbkx/samples/versions-atom.xml
index 55c27318..67783e8e 100644
--- a/docs/guide/src/docbkx/samples/versions-atom.xml
+++ b/docs/guide/src/docbkx/samples/versions-atom.xml
@@ -6,6 +6,13 @@
     <author><name>Rackspace</name><uri>http://www.rackspace.com/</uri></author>
     <link rel="self" href="http://identity.api.openstack.org/"/>
     <entry>
+       <id>http://identity.api.openstack.org/v2.0/</id>
+       <title type="text">Version v2.0</title>
+       <updated>2011-05-27T20:22:02.25Z</updated>
+       <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
+       <content type="text">Version v2.1 CURRENT (2011-05-27T20:22:02.25Z)</content>
+    </entry>
+    <entry>
        <id>http://identity.api.openstack.org/v1.1/</id>
        <title type="text">Version v1.1</title>
        <updated>2010-12-12T18:30:02.25Z</updated>
@@ -16,7 +23,7 @@
        <id>http://identity.api.openstack.org/v1.0/</id>
        <title type="text">Version v1.0</title>
        <updated>2009-10-09T11:30:00Z</updated>
-       <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
+       <link rel="self" href="http://identity.api.openstack.org/v1.0/"/>
        <content type="text">Version v1.0 DEPRECATED (2009-10-09T11:30:00Z)</content>
     </entry>
 </feed>
diff --git a/docs/guide/src/docbkx/samples/versions.json b/docs/guide/src/docbkx/samples/versions.json
index e746b38a..ec3a8498 100644
--- a/docs/guide/src/docbkx/samples/versions.json
+++ b/docs/guide/src/docbkx/samples/versions.json
@@ -8,7 +8,7 @@
                 "links": [
                     {
                         "rel" : "self",
-                        "href" : "http://identity.api.openstack.org/v2.0/"
+                        "href" : "http://identity.api.openstack.org/v1.0/"
                     }
                 ]
             },
@@ -22,6 +22,17 @@
                         "href" : "http://identity.api.openstack.org/v1.1/"
                     }
                 ]
+            },
+            {
+                "id" : "v2.0",
+                "status" : "BETA",
+                "updated" : "2011-05-27T20:22:02.25Z",
+                "links": [
+                    {
+                        "rel" : "self",
+                        "href" : "http://identity.api.openstack.org/v2.0/"
+                    }
+                ]
             }
         ]
     }
diff --git a/docs/guide/src/docbkx/samples/versions.xml b/docs/guide/src/docbkx/samples/versions.xml
index 67441838..df55b106 100644
--- a/docs/guide/src/docbkx/samples/versions.xml
+++ b/docs/guide/src/docbkx/samples/versions.xml
@@ -6,7 +6,7 @@
  <version id="v1.0" status="DEPRECATED" 
           updated="2009-10-09T11:30:00Z">
      <atom:link rel="self"
-                href="http://identity.api.openstack.org/v2.0/"/>
+                href="http://identity.api.openstack.org/v1.0/"/>
  </version>
 
  <version id="v1.1" status="CURRENT"
@@ -15,4 +15,10 @@
                 href="http://identity.api.openstack.org/v1.1/"/>
  </version>
 
+ <version id="v2.0" status="BETA"
+          updated="2011-05-27T20:22:02.25Z">
+     <atom:link rel="self"
+                href="http://identity.api.openstack.org/v2.0/"/>
+ </version>
+ 
 </versions>
diff --git a/docs/nova-api-paste.ini b/docs/nova-api-paste.ini
deleted file mode 100644
index b4a94557..00000000
--- a/docs/nova-api-paste.ini
+++ /dev/null
@@ -1,114 +0,0 @@
-#######
-# EC2 #
-#######
-
-[composite:ec2]
-use = egg:Paste#urlmap
-/: ec2versions
-/services/Cloud: ec2cloud
-/services/Admin: ec2admin
-/latest: ec2metadata
-/2007-01-19: ec2metadata
-/2007-03-01: ec2metadata
-/2007-08-29: ec2metadata
-/2007-10-10: ec2metadata
-/2007-12-15: ec2metadata
-/2008-02-01: ec2metadata
-/2008-09-01: ec2metadata
-/2009-04-04: ec2metadata
-/1.0: ec2metadata
-
-[pipeline:ec2cloud]
-pipeline = logrequest authenticate cloudrequest authorizer ec2executor
-#pipeline = logrequest ec2lockout authenticate cloudrequest authorizer ec2executor
-
-[pipeline:ec2admin]
-pipeline = logrequest authenticate adminrequest authorizer ec2executor
-
-[pipeline:ec2metadata]
-pipeline = logrequest ec2md
-
-[pipeline:ec2versions]
-pipeline = logrequest ec2ver
-
-[filter:logrequest]
-paste.filter_factory = nova.api.ec2:RequestLogging.factory
-
-[filter:ec2lockout]
-paste.filter_factory = nova.api.ec2:Lockout.factory
-
-[filter:authenticate]
-paste.filter_factory = nova.api.ec2:Authenticate.factory
-
-[filter:cloudrequest]
-controller = nova.api.ec2.cloud.CloudController
-paste.filter_factory = nova.api.ec2:Requestify.factory
-
-[filter:adminrequest]
-controller = nova.api.ec2.admin.AdminController
-paste.filter_factory = nova.api.ec2:Requestify.factory
-
-[filter:authorizer]
-paste.filter_factory = nova.api.ec2:Authorizer.factory
-
-[app:ec2executor]
-paste.app_factory = nova.api.ec2:Executor.factory
-
-[app:ec2ver]
-paste.app_factory = nova.api.ec2:Versions.factory
-
-[app:ec2md]
-paste.app_factory = nova.api.ec2.metadatarequesthandler:MetadataRequestHandler.factory
-
-#############
-# Openstack #
-#############
-
-[composite:osapi]
-use = egg:Paste#urlmap
-/: osversions
-/v1.0: openstackapi10
-/v1.1: openstackapi11
-
-[pipeline:openstackapi10]
-pipeline = faultwrap tokenauth auth_shim ratelimit osapiapp10
-
-[pipeline:openstackapi11]
-pipeline = faultwrap tokenauth auth_shim ratelimit extensions osapiapp11
-
-[filter:faultwrap]
-paste.filter_factory = nova.api.openstack:FaultWrapper.factory
-
-[filter:auth]
-paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory
-
-[filter:tokenauth]
-paste.filter_factory = keystone.auth_protocols.auth_token:filter_factory
-service_protocol = http
-service_host = 127.0.0.1
-service_port = 808
-auth_host = 127.0.0.1
-auth_port = 8081
-auth_protocol = http
-admin_token = 999888777666
-
-[filter:auth_shim]
-paste.filter_factory = keystone.auth_protocols.nova_auth_token:KeystoneAuthShim.factory
-
-[filter:ratelimit]
-paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory
-
-[filter:extensions]
-paste.filter_factory = nova.api.openstack.extensions:ExtensionMiddleware.factory
-
-[app:osapiapp10]
-paste.app_factory = nova.api.openstack:APIRouterV10.factory
-
-[app:osapiapp11]
-paste.app_factory = nova.api.openstack:APIRouterV11.factory
-
-[pipeline:osversions]
-pipeline = faultwrap osversionapp
-
-[app:osversionapp]
-paste.app_factory = nova.api.openstack.versions:Versions.factory