Issue 31: Updated docs and examples

7 files changed, 14 insertions, 14 deletions

diff --git a/README.md b/README.md
index 42e35980..146b3b43 100644
--- a/README.md
+++ b/README.md
@@ -197,11 +197,11 @@ in troubleshooting:
 <pre>
     # Get an unscoped token
     
-    $ curl -d '{"passwordCredentials": {"username": "joeuser", "password": "secrete"}}' -H "Content-type: application/json" http://localhost:8081/v2.0/tokens
+    $ curl -d '{"passwordCredentials": {"username": "joeuser", "password": "secrete"}}' -H "Content-type: application/json" http://localhost:8080/v2.0/tokens
 
     # Get a token for a tenant
 
-    $ curl -d '{"passwordCredentials": {"username": "joeuser", "password": "secrete", "tenantId": "1234"}}' -H "Content-type: application/json" http://localhost:8081/v2.0/tokens
+    $ curl -d '{"passwordCredentials": {"username": "joeuser", "password": "secrete", "tenantId": "1234"}}' -H "Content-type: application/json" http://localhost:8080/v2.0/tokens
 </pre>
 
 #### Load Testing
@@ -213,7 +213,7 @@ in troubleshooting:
 
    # Call Apache Bench
 
-   $ ab -c 30 -n 1000 -T "application/json" -p post_data http://127.0.0.1:8081/v2.0/tokens
+   $ ab -c 30 -n 1000 -T "application/json" -p post_data http://127.0.0.1:8080/v2.0/tokens
 </pre>
 
 ## NOVA Integration
@@ -255,8 +255,8 @@ Assuming you added the test data using bin/sampledata.sh, you can then use joeus
 
         $ cd ~/keystone/bin && ./keystone
         Starting the Legacy Authentication component
-        Service API listening on 0.0.0.0:8080
-        Admin API listening on 0.0.0.0:8081
+        Service API listening on 0.0.0.0:80
+        Admin API listening on 0.0.0.0:8080
 
 4.  In another window, edit the `~/keystone/bin/sampledata.sh` file, find the
     `public.cloudfiles.com` text and replace it with the URL to your Swift
diff --git a/bin/sampledata.sh b/bin/sampledata.sh
index 6f73e06c..134c5ea3 100755
--- a/bin/sampledata.sh
+++ b/bin/sampledata.sh
@@ -43,7 +43,7 @@
 ./keystone-manage $* baseURLs add RegionOne nova http://nova.publicinternets.com/v1.1/ http://127.0.0.1:8774/v1.1  http://localhost:8774/v1.1 1
 ./keystone-manage $* baseURLs add RegionOne glance http://glance.publicinternets.com/v1.1/%tenant_id% http://nova.admin-nets.local/v1.1/%tenant_id% http://127.0.0.1:9292/v1.1/%tenant_id% 1
 ./keystone-manage $* baseURLs add RegionOne cdn http://cdn.publicinternets.com/v1.1/%tenant_id% http://cdn.admin-nets.local/v1.1/%tenant_id% http://127.0.0.1:7777/v1.1/%tenant_id% 1
-./keystone-manage $* baseURLs add RegionOne keystone http://keystone.publicinternets.com/v2.0 http://127.0.0.1:8081/v2.0 http://127.0.0.1:8080/v2.0 1
+./keystone-manage $* baseURLs add RegionOne keystone http://keystone.publicinternets.com/v2.0 http://127.0.0.1:8080/v2.0 http://127.0.0.1:80/v2.0 1
 
 # Groups
 #./keystone-manage $* group add Admin 1234
diff --git a/examples/echo/echo/echo.ini b/examples/echo/echo/echo.ini
index a7b95e9e..b654a13f 100644
--- a/examples/echo/echo/echo.ini
+++ b/examples/echo/echo/echo.ini
@@ -6,7 +6,7 @@ delay_auth_decision = 0
 ;where to find the OpenStack service (if not in local WSGI chain)
 service_protocol = http
 service_host = 127.0.0.1
-service_port = 8081
+service_port = 8080
 ;used to verify this component with the OpenStack service (or PAPIAuth)
 service_pass = dTpw
 
@@ -23,7 +23,7 @@ pipeline =
 paste.filter_factory = keystone.auth_protocols.auth_token:filter_factory
 ;where to find the token auth service
 auth_host = 127.0.0.1
-auth_port = 8081
+auth_port = 8080
 auth_protocol = http
 ;how to authenticate to the auth service for priviledged operations
 ;like validate token
diff --git a/examples/echo/echo/echo_basic.ini b/examples/echo/echo/echo_basic.ini
index 65c85357..8436d883 100644
--- a/examples/echo/echo/echo_basic.ini
+++ b/examples/echo/echo/echo_basic.ini
@@ -6,7 +6,7 @@ delay_auth_decision = 0
 ;where to find the OpenStack service (if not in local WSGI chain)
 service_protocol = http
 service_host = 127.0.0.1
-service_port = 8081
+service_port = 8080
 ;used to verify this component with the OpenStack service (or PAPIAuth)
 service_pass = dTpw
 
@@ -23,7 +23,7 @@ pipeline =
 paste.filter_factory = keystone.auth_protocols.auth_token:filter_factory
 ;where to find the token auth service
 auth_host = 127.0.0.1
-auth_port = 8081
+auth_port = 8080
 auth_protocol = http
 ;how to authenticate to the auth service for priviledged operations
 ;like validate token
diff --git a/examples/echo/echo/echo_remote.ini b/examples/echo/echo/echo_remote.ini
index d225f756..7418f574 100644
--- a/examples/echo/echo/echo_remote.ini
+++ b/examples/echo/echo/echo_remote.ini
@@ -14,6 +14,6 @@ paste.filter_factory = keystone.middleware.remoteauth:filter_factory
 ; (otherwise we redirect call)
 remote_auth_pass = dTpw
 ;where to redirect untrusted calls to
-auth_location = http://127.0.0.1:8081/
+auth_location = http://127.0.0.1:8080/
 
 
diff --git a/examples/paste/auth_token.ini b/examples/paste/auth_token.ini
index 25f2cbbf..3154fc69 100644
--- a/examples/paste/auth_token.ini
+++ b/examples/paste/auth_token.ini
@@ -5,7 +5,7 @@ paste.app_factory = auth_token:app_factory
 
 auth_protocol = http
 auth_host = 127.0.0.1
-auth_port = 8081
+auth_port = 8080
 admin_token = 999888777666
 
 delay_auth_decision = 0
diff --git a/examples/paste/nova-api-paste.ini b/examples/paste/nova-api-paste.ini
index b4a94557..2082990d 100644
--- a/examples/paste/nova-api-paste.ini
+++ b/examples/paste/nova-api-paste.ini
@@ -86,9 +86,9 @@ paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory
 paste.filter_factory = keystone.auth_protocols.auth_token:filter_factory
 service_protocol = http
 service_host = 127.0.0.1
-service_port = 808
+service_port = 8080
 auth_host = 127.0.0.1
-auth_port = 8081
+auth_port = 8080
 auth_protocol = http
 admin_token = 999888777666