From 550d94eb6cf2a5a844cec62dc505492c04ef2bc4 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Sun, 24 Apr 2011 17:07:50 -0700 Subject: fixed paste configs to run without eggs --- echo/echo/echo.ini | 7 +++---- echo/setup.py | 2 +- keystone/__init__.py | 3 +++ setup.py | 5 ++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/echo/echo/echo.ini b/echo/echo/echo.ini index 020198b5..a0d5caeb 100644 --- a/echo/echo/echo.ini +++ b/echo/echo/echo.ini @@ -1,8 +1,7 @@ [DEFAULT] [app:echo] -use = egg:echo -#/ = echo +paste.app_factory = echo:app_factory [pipeline:main] pipeline = @@ -11,13 +10,13 @@ pipeline = echo [filter:papiauth] -use = egg:keystone#papiauth +paste.filter_factory = keystone:papiauth_factory auth_ip = 127.0.0.1 auth_port = 8080 auth_pass = dTpw [filter:auth] -use = egg:keystone#tokenauth +paste.filter_factory = keystone:tokenauth_factory auth_ip = 127.0.0.1 auth_port = 8080 auth_pass = dTpw diff --git a/echo/setup.py b/echo/setup.py index 6c0fa8d3..045df550 100644 --- a/echo/setup.py +++ b/echo/setup.py @@ -33,7 +33,7 @@ setup( entry_points={ 'paste.app_factory': ['main=echo:app_factory'], 'paste.filter_factory': [ - 'papiauth=keystone.middleware.papiauth:filter_factory', + 'papiauth=keystone:papiauth_factory', ], }, ) diff --git a/keystone/__init__.py b/keystone/__init__.py index e69de29b..4f59db41 100644 --- a/keystone/__init__.py +++ b/keystone/__init__.py @@ -0,0 +1,3 @@ +from keystone.middleware.papiauth import filter_factory as papiauth_factory +from keystone.auth_protocol.auth_protocol_token \ + import filter_factory as tokenauth_factory diff --git a/setup.py b/setup.py index ea49ce0a..83ead0ca 100644 --- a/setup.py +++ b/setup.py @@ -35,9 +35,8 @@ setup( entry_points={ 'paste.app_factory': ['main=identity:app_factory'], 'paste.filter_factory': [ - 'papiauth=keystone.middleware.papiauth:filter_factory', - 'tokenauth=keystone.auth_protocol.' + - 'auth_protocol_token:filter_factory', + 'papiauth=keystone:papiauth_factory', + 'tokenauth=keystone:tokenauth_factory', ], }, ) -- cgit