Moved exthandler to keystone.middleware

5 files changed, 3 insertions, 3 deletions

diff --git a/etc/keystone.conf b/etc/keystone.conf
index f93e3b58..425b41ee 100755
--- a/etc/keystone.conf
+++ b/etc/keystone.conf
@@ -80,7 +80,7 @@ paste.app_factory = keystone.server:app_factory
 paste.app_factory = keystone.server:admin_app_factory
 
 [filter:exthandler]
-paste.filter_factory = keystone.queryext.exthandler:filter_factory
+paste.filter_factory = keystone.middleware.exthandler:filter_factory
 
 [filter:legacy_auth]
 paste.filter_factory = keystone.frontends.legacy_token_auth:filter_factory
diff --git a/keystone/queryext/exthandler.py b/keystone/middleware/exthandler.py
index e0fae135..e0fae135 100644
--- a/keystone/queryext/exthandler.py
+++ b/keystone/middleware/exthandler.py
diff --git a/keystone/queryext/__init__.py b/keystone/queryext/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/keystone/queryext/__init__.py
+++ /dev/null
diff --git a/keystone/test/unit/test_exthandler.py b/keystone/test/unit/test_exthandler.py
index 1e881a54..76614ab6 100644
--- a/keystone/test/unit/test_exthandler.py
+++ b/keystone/test/unit/test_exthandler.py
@@ -19,7 +19,7 @@ import sys
 # Need to access identity module
 sys.path.append(os.path.abspath(os.path.join(
     os.getcwd(), '..', '..', 'keystone')))
-from keystone.queryext.exthandler import UrlExtensionFilter
+from keystone.middleware.exthandler import UrlExtensionFilter
 import unittest
 
 
diff --git a/setup.py b/setup.py
index 6ed7a418..6e7276a4 100755
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ setup(
     entry_points={
         'paste.app_factory': ['main=identity:app_factory'],
         'paste.filter_factory': [
-            'extfilter=keystone.queryext.exthandler:filter_factory',
+            'extfilter=keystone.middleware.exthandler:filter_factory',
             'remoteauth=keystone.middleware.remoteauth:remoteauth_factory',
             'tokenauth=keystone.auth_protocols.auth_token:filter_factory',
             'swiftauth=keystone.middleware.swift_auth:filter_factory',