Initial commit of middleware refactor

1 files changed, 34 insertions, 17 deletions

diff --git a/setup.py b/setup.py
index 1c711b764..02dd38949 100644
--- a/setup.py
+++ b/setup.py
@@ -55,21 +55,38 @@ setup(
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python :: 2.6',
         'Environment :: No Input/Output (Daemon)',
-    ],
+        ],
     install_requires=[], # removed for better compat
-    scripts=['bin/st', 'bin/swift-account-auditor',
-             'bin/swift-account-audit', 'bin/swift-account-reaper',
-             'bin/swift-account-replicator', 'bin/swift-account-server',
-             'bin/swift-auth-create-account',
-             'bin/swift-auth-recreate-accounts', 'bin/swift-auth-server',
-             'bin/swift-container-auditor',
-             'bin/swift-container-replicator',
-             'bin/swift-container-server', 'bin/swift-container-updater',
-             'bin/swift-drive-audit', 'bin/swift-get-nodes',
-             'bin/swift-init', 'bin/swift-object-auditor',
-             'bin/swift-object-info',
-             'bin/swift-object-replicator',
-             'bin/swift-object-server',
-             'bin/swift-object-updater', 'bin/swift-proxy-server',
-             'bin/swift-ring-builder', 'bin/swift-stats-populate',
-             'bin/swift-stats-report'])
+    scripts=[
+        'bin/st', 'bin/swift-account-auditor',
+        'bin/swift-account-audit', 'bin/swift-account-reaper',
+        'bin/swift-account-replicator', 'bin/swift-account-server',
+        'bin/swift-auth-create-account',
+        'bin/swift-auth-recreate-accounts', 'bin/swift-auth-server',
+        'bin/swift-container-auditor',
+        'bin/swift-container-replicator',
+        'bin/swift-container-server', 'bin/swift-container-updater',
+        'bin/swift-drive-audit', 'bin/swift-get-nodes',
+        'bin/swift-init', 'bin/swift-object-auditor',
+        'bin/swift-object-info',
+        'bin/swift-object-replicator',
+        'bin/swift-object-server',
+        'bin/swift-object-updater', 'bin/swift-proxy-server',
+        'bin/swift-ring-builder', 'bin/swift-stats-populate',
+        'bin/swift-stats-report'
+        ],
+    entry_points={
+        'paste.app_factory' : [
+            'proxy=swift.proxy.server:app_factory',
+            'object=swift.obj.server:app_factory',
+            'container=swift.container.server:app_factory',
+            'account=swift.account.server:app_factory',
+            'auth=swift.auth.server:app_factory',
+            ],
+        'paste.filter_factory' : [
+            'auth=swift.common.middleware.auth:filter_factory',
+            'healthcheck=swift.common.middleware.healthcheck:filter_factory',
+            'cache=swift.common.middleware.cache:filter_factory',
+            ],
+        },
+    )