Made app_templates pluggable; added serve command to paste-setup

1 files changed, 13 insertions, 4 deletions

diff --git a/paste/servers/ajp_threaded_server.py b/paste/servers/ajp_threaded_server.py
index 130baa4..d1e6e92 100644
--- a/paste/servers/ajp_threaded_server.py
+++ b/paste/servers/ajp_threaded_server.py
@@ -1,3 +1,4 @@
+from optparse import Option
 from paste.util import thirdparty
 thirdparty.add_package('flup')
 from paste import pyconfig
@@ -17,10 +18,18 @@ def serve_server(conf, app, server_class):
     return server.run()
 
 options = [
-    ('host', 'The host name to bind to (default localhost).  Note, if binding to localhost, only local connections will be allowed.'),
-    ('port', 'The port to bind to (default 8009).'),
-    ('root_url', 'The URL level to expect for incoming connections; if not set and this is not bound to /, then SCRIPT_NAME and PATH_INFO may be incorrect.'),
-    ('allowed_servers', 'A list of servers to allow connections from.'),
+    Option('--host',
+           metavar="HOST",
+           help='The host name to bind to (default localhost).  Note, if binding to localhost, only local connections will be allowed.'),
+    Option('--port',
+           metavar="PORT",
+           help='The port to bind to (default 8009).'),
+    Option('--root-url',
+           metavar="URL",
+           help='The URL level to expect for incoming connections; if not set and this is not bound to /, then SCRIPT_NAME and PATH_INFO may be incorrect.'),
+    Option('--allowed-servers',
+           metavar="IP_LIST",
+           help='A list of servers to allow connections from.'),
     ]
 
 description = """\