# HG changeset patch # User paulb # Date 1111686063 0 # Node ID 2fd0fc812a293db939fd691cd39ee427a495a097 # Parent a438f7ca4bde252aa8ae87fc7b44b6c44b29d5cd [project @ 2005-03-24 17:40:59 by paulb] Introduced a standardised 'deploy' function for all suitable frameworks. diff -r a438f7ca4bde -r 2fd0fc812a29 examples/BaseHTTPRequestHandler/AuthApp.py --- a/examples/BaseHTTPRequestHandler/AuthApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/BaseHTTPRequestHandler/AuthApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,15 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import BaseHTTPRequestHandler +from WebStack.Adapters.BaseHTTPRequestHandler import deploy from Auth import AuthResource, AuthAuthenticator -import BaseHTTPServer - -# Special magic incantation. -handler = BaseHTTPRequestHandler.HandlerFactory(AuthResource(), AuthAuthenticator()) -address = ("", 8080) -server = BaseHTTPServer.HTTPServer(address, handler) print "Serving..." -server.serve_forever() +deploy(AuthResource(), AuthAuthenticator()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/BaseHTTPRequestHandler/CalendarApp.py --- a/examples/BaseHTTPRequestHandler/CalendarApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/BaseHTTPRequestHandler/CalendarApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,15 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import BaseHTTPRequestHandler +from WebStack.Adapters.BaseHTTPRequestHandler import deploy from Calendar import DirectoryResource -import BaseHTTPServer - -# Special magic incantation. -handler = BaseHTTPRequestHandler.HandlerFactory(DirectoryResource()) -address = ("", 8080) -server = BaseHTTPServer.HTTPServer(address, handler) print "Serving..." -server.serve_forever() +deploy(DirectoryResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/BaseHTTPRequestHandler/CookiesApp.py --- a/examples/BaseHTTPRequestHandler/CookiesApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/BaseHTTPRequestHandler/CookiesApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,15 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import BaseHTTPRequestHandler +from WebStack.Adapters.BaseHTTPRequestHandler import deploy from Cookies import CookiesResource -import BaseHTTPServer - -# Special magic incantation. -handler = BaseHTTPRequestHandler.HandlerFactory(CookiesResource()) -address = ("", 8080) -server = BaseHTTPServer.HTTPServer(address, handler) print "Serving..." -server.serve_forever() +deploy(CookiesResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/BaseHTTPRequestHandler/FormApp.py --- a/examples/BaseHTTPRequestHandler/FormApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/BaseHTTPRequestHandler/FormApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,15 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import BaseHTTPRequestHandler +from WebStack.Adapters.BaseHTTPRequestHandler import deploy from Form import FormResource -import BaseHTTPServer - -# Special magic incantation. -handler = BaseHTTPRequestHandler.HandlerFactory(FormResource()) -address = ("", 8080) -server = BaseHTTPServer.HTTPServer(address, handler) print "Serving..." -server.serve_forever() +deploy(FormResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/BaseHTTPRequestHandler/LoginApp.py --- a/examples/BaseHTTPRequestHandler/LoginApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/BaseHTTPRequestHandler/LoginApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,12 +1,10 @@ #!/usr/bin/env python -from WebStack.Adapters import BaseHTTPRequestHandler +from WebStack.Adapters.BaseHTTPRequestHandler import deploy from WebStack.Resources.Login import LoginResource, LoginAuthenticator -import BaseHTTPServer -# Special magic incantation. - -handler = BaseHTTPRequestHandler.HandlerFactory( +print "Serving..." +deploy( LoginResource( LoginAuthenticator( secret_key="horses", @@ -15,11 +13,8 @@ ("vole", "xyz"), ) ) - ) + ), + address=("", 8081) ) -address = ("", 8081) -server = BaseHTTPServer.HTTPServer(address, handler) -print "Serving..." -server.serve_forever() # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/BaseHTTPRequestHandler/SessionsApp.py --- a/examples/BaseHTTPRequestHandler/SessionsApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/BaseHTTPRequestHandler/SessionsApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,15 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import BaseHTTPRequestHandler +from WebStack.Adapters.BaseHTTPRequestHandler import deploy from Sessions import SessionsResource -import BaseHTTPServer - -# Special magic incantation. -handler = BaseHTTPRequestHandler.HandlerFactory(SessionsResource()) -address = ("", 8080) -server = BaseHTTPServer.HTTPServer(address, handler) print "Serving..." -server.serve_forever() +deploy(SessionsResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/BaseHTTPRequestHandler/SimpleApp.py --- a/examples/BaseHTTPRequestHandler/SimpleApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/BaseHTTPRequestHandler/SimpleApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,15 +1,11 @@ #!/usr/bin/env python -from WebStack.Adapters import BaseHTTPRequestHandler +from WebStack.Adapters.BaseHTTPRequestHandler import deploy from Simple import SimpleResource -import BaseHTTPServer # Special magic incantation. -handler = BaseHTTPRequestHandler.HandlerFactory(SimpleResource()) -address = ("", 8080) -server = BaseHTTPServer.HTTPServer(address, handler) print "Serving..." -server.serve_forever() +deploy(SimpleResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/BaseHTTPRequestHandler/SimpleWithLoginApp.py --- a/examples/BaseHTTPRequestHandler/SimpleWithLoginApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/BaseHTTPRequestHandler/SimpleWithLoginApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,13 +1,11 @@ #!/usr/bin/env python -from WebStack.Adapters import BaseHTTPRequestHandler +from WebStack.Adapters.BaseHTTPRequestHandler import deploy from WebStack.Resources.LoginRedirect import LoginRedirectResource, LoginRedirectAuthenticator from Simple import SimpleResource -import BaseHTTPServer -# Special magic incantation. - -handler = BaseHTTPRequestHandler.HandlerFactory( +print "Serving..." +deploy( LoginRedirectResource( login_url="http://localhost:8081", app_url="http://localhost:8080", @@ -17,9 +15,5 @@ logout_parameter_name="logout" ) ) -address = ("", 8080) -server = BaseHTTPServer.HTTPServer(address, handler) -print "Serving..." -server.serve_forever() # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/BaseHTTPRequestHandler/UnicodeApp.py --- a/examples/BaseHTTPRequestHandler/UnicodeApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/BaseHTTPRequestHandler/UnicodeApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,15 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import BaseHTTPRequestHandler +from WebStack.Adapters.BaseHTTPRequestHandler import deploy from Unicode import UnicodeResource -import BaseHTTPServer - -# Special magic incantation. -handler = BaseHTTPRequestHandler.HandlerFactory(UnicodeResource()) -address = ("", 8080) -server = BaseHTTPServer.HTTPServer(address, handler) print "Serving..." -server.serve_forever() +deploy(UnicodeResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/CGI/CookiesHandler.py --- a/examples/CGI/CookiesHandler.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/CGI/CookiesHandler.py Thu Mar 24 17:41:03 2005 +0000 @@ -6,10 +6,9 @@ sys.path.append("/home/paulb/Software/Python/WebStack") sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") -from WebStack.Adapters import CGI +from WebStack.Adapters.CGI import deploy from Cookies import CookiesResource -resource = CookiesResource() -CGI.respond(resource) +deploy(CookiesResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/CGI/FormHandler.py --- a/examples/CGI/FormHandler.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/CGI/FormHandler.py Thu Mar 24 17:41:03 2005 +0000 @@ -6,10 +6,9 @@ sys.path.append("/home/paulb/Software/Python/WebStack") sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") -from WebStack.Adapters import CGI +from WebStack.Adapters.CGI import deploy from Form import FormResource -resource = FormResource() -CGI.respond(resource) +deploy(FormResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/CGI/LoginHandler.py --- a/examples/CGI/LoginHandler.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/CGI/LoginHandler.py Thu Mar 24 17:41:03 2005 +0000 @@ -6,18 +6,19 @@ sys.path.append("/home/paulb/Software/Python/WebStack") sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") -from WebStack.Adapters import CGI +from WebStack.Adapters.CGI import deploy from WebStack.Resources.Login import LoginResource, LoginAuthenticator -resource = LoginResource( - LoginAuthenticator( - secret_key="horses", - credentials=( - ("badger", "abc"), - ("vole", "xyz"), +deploy( + LoginResource( + LoginAuthenticator( + secret_key="horses", + credentials=( + ("badger", "abc"), + ("vole", "xyz"), + ) ) ) ) -CGI.respond(resource) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/CGI/SessionsHandler.py --- a/examples/CGI/SessionsHandler.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/CGI/SessionsHandler.py Thu Mar 24 17:41:03 2005 +0000 @@ -6,10 +6,9 @@ sys.path.append("/home/paulb/Software/Python/WebStack") sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") -from WebStack.Adapters import CGI +from WebStack.Adapters.CGI import deploy from Sessions import SessionsResource -resource = SessionsResource() -CGI.respond(resource) +deploy(SessionsResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/CGI/SimpleHandler.py --- a/examples/CGI/SimpleHandler.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/CGI/SimpleHandler.py Thu Mar 24 17:41:03 2005 +0000 @@ -6,10 +6,9 @@ sys.path.append("/home/paulb/Software/Python/WebStack") sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") -from WebStack.Adapters import CGI +from WebStack.Adapters.CGI import deploy from Simple import SimpleResource -resource = SimpleResource() -CGI.respond(resource) +deploy(SimpleResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/CGI/SimpleWithLoginHandler.py --- a/examples/CGI/SimpleWithLoginHandler.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/CGI/SimpleWithLoginHandler.py Thu Mar 24 17:41:03 2005 +0000 @@ -6,18 +6,19 @@ sys.path.append("/home/paulb/Software/Python/WebStack") sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") -from WebStack.Adapters import CGI +from WebStack.Adapters.CGI import deploy from WebStack.Resources.LoginRedirect import LoginRedirectResource, LoginRedirectAuthenticator from Simple import SimpleResource -resource = LoginRedirectResource( - login_url="http://localhost/cgi/login", - app_url="http://localhost", - resource=SimpleResource(), - authenticator=LoginRedirectAuthenticator(secret_key="horses"), - anonymous_parameter_name="anonymous", - logout_parameter_name="logout" +deploy( + LoginRedirectResource( + login_url="http://localhost/cgi/login", + app_url="http://localhost", + resource=SimpleResource(), + authenticator=LoginRedirectAuthenticator(secret_key="horses"), + anonymous_parameter_name="anonymous", + logout_parameter_name="logout" + ) ) -CGI.respond(resource) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/CGI/UnicodeHandler.py --- a/examples/CGI/UnicodeHandler.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/CGI/UnicodeHandler.py Thu Mar 24 17:41:03 2005 +0000 @@ -6,10 +6,9 @@ sys.path.append("/home/paulb/Software/Python/WebStack") sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") -from WebStack.Adapters import CGI +from WebStack.Adapters.CGI import deploy from Unicode import UnicodeResource -resource = UnicodeResource() -CGI.respond(resource) +deploy(UnicodeResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/Twisted/AuthApp.py --- a/examples/Twisted/AuthApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/Twisted/AuthApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,16 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import Twisted +from WebStack.Adapters.Twisted import deploy from Auth import AuthResource, AuthAuthenticator -import twisted.web.server -import twisted.internet.reactor -# Special magic incantation. - -top_level = Twisted.Dispatcher(AuthResource(), AuthAuthenticator()) -site = twisted.web.server.Site(top_level) -twisted.internet.reactor.listenTCP(8080, site) print "Serving..." -twisted.internet.reactor.run() +deploy(AuthResource(), AuthAuthenticator()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/Twisted/CalendarApp.py --- a/examples/Twisted/CalendarApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/Twisted/CalendarApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,16 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import Twisted +from WebStack.Adapters.Twisted import deploy from Calendar import DirectoryResource -import twisted.web.server -import twisted.internet.reactor -# Special magic incantation. - -top_level = Twisted.Dispatcher(DirectoryResource()) -site = twisted.web.server.Site(top_level) -twisted.internet.reactor.listenTCP(8080, site) print "Serving..." -twisted.internet.reactor.run() +deploy(DirectoryResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/Twisted/CookiesApp.py --- a/examples/Twisted/CookiesApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/Twisted/CookiesApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,16 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import Twisted +from WebStack.Adapters.Twisted import deploy from Cookies import CookiesResource -import twisted.web.server -import twisted.internet.reactor -# Special magic incantation. - -top_level = Twisted.Dispatcher(CookiesResource()) -site = twisted.web.server.Site(top_level) -twisted.internet.reactor.listenTCP(8080, site) print "Serving..." -twisted.internet.reactor.run() +deploy(CookiesResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/Twisted/FormApp.py --- a/examples/Twisted/FormApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/Twisted/FormApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,16 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import Twisted +from WebStack.Adapters.Twisted import deploy from Form import FormResource -import twisted.web.server -import twisted.internet.reactor -# Special magic incantation. - -top_level = Twisted.Dispatcher(FormResource()) -site = twisted.web.server.Site(top_level) -twisted.internet.reactor.listenTCP(8080, site) print "Serving..." -twisted.internet.reactor.run() +deploy(FormResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/Twisted/LoginApp.py --- a/examples/Twisted/LoginApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/Twisted/LoginApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,26 +1,20 @@ #!/usr/bin/env python -from WebStack.Adapters import Twisted +from WebStack.Adapters.Twisted import deploy from WebStack.Resources.Login import LoginResource, LoginAuthenticator -import twisted.web.server -import twisted.internet.reactor - -# Special magic incantation. -resource = LoginResource( - LoginAuthenticator( - secret_key="horses", - credentials=( - ("badger", "abc"), - ("vole", "xyz"), +print "Serving..." +deploy( + LoginResource( + LoginAuthenticator( + secret_key="horses", + credentials=( + ("badger", "abc"), + ("vole", "xyz"), + ) ) - ) + ), + address=("", 8081) ) -top_level = Twisted.Dispatcher(resource) -site = twisted.web.server.Site(top_level) -twisted.internet.reactor.listenTCP(8081, site) -print "Serving..." -twisted.internet.reactor.run() - # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/Twisted/SessionsApp.py --- a/examples/Twisted/SessionsApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/Twisted/SessionsApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,16 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import Twisted +from WebStack.Adapters.Twisted import deploy from Sessions import SessionsResource -import twisted.web.server -import twisted.internet.reactor -# Special magic incantation. - -top_level = Twisted.Dispatcher(SessionsResource()) -site = twisted.web.server.Site(top_level) -twisted.internet.reactor.listenTCP(8080, site) print "Serving..." -twisted.internet.reactor.run() +deploy(SessionsResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/Twisted/SimpleApp.py --- a/examples/Twisted/SimpleApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/Twisted/SimpleApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,16 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import Twisted +from WebStack.Adapters.Twisted import deploy from Simple import SimpleResource -import twisted.web.server -import twisted.internet.reactor -# Special magic incantation. - -top_level = Twisted.Dispatcher(SimpleResource()) -site = twisted.web.server.Site(top_level) -twisted.internet.reactor.listenTCP(8080, site) print "Serving..." -twisted.internet.reactor.run() +deploy(SimpleResource()) # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/Twisted/SimpleWithLoginApp.py --- a/examples/Twisted/SimpleWithLoginApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/Twisted/SimpleWithLoginApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,26 +1,19 @@ #!/usr/bin/env python -from WebStack.Adapters import Twisted +from WebStack.Adapters.Twisted import deploy from WebStack.Resources.LoginRedirect import LoginRedirectResource, LoginRedirectAuthenticator from Simple import SimpleResource -import twisted.web.server -import twisted.internet.reactor -# Special magic incantation. - -resource = LoginRedirectResource( - login_url="http://localhost:8081", - app_url="http://localhost:8080", - resource=SimpleResource(), - authenticator=LoginRedirectAuthenticator(secret_key="horses"), - anonymous_parameter_name="anonymous", - logout_parameter_name="logout" +print "Serving..." +deploy( + LoginRedirectResource( + login_url="http://localhost:8081", + app_url="http://localhost:8080", + resource=SimpleResource(), + authenticator=LoginRedirectAuthenticator(secret_key="horses"), + anonymous_parameter_name="anonymous", + logout_parameter_name="logout" + ) ) -top_level = Twisted.Dispatcher(resource) -site = twisted.web.server.Site(top_level) -twisted.internet.reactor.listenTCP(8080, site) -print "Serving..." -twisted.internet.reactor.run() - # vim: tabstop=4 expandtab shiftwidth=4 diff -r a438f7ca4bde -r 2fd0fc812a29 examples/Twisted/UnicodeApp.py --- a/examples/Twisted/UnicodeApp.py Thu Mar 24 17:40:50 2005 +0000 +++ b/examples/Twisted/UnicodeApp.py Thu Mar 24 17:41:03 2005 +0000 @@ -1,16 +1,9 @@ #!/usr/bin/env python -from WebStack.Adapters import Twisted +from WebStack.Adapters.Twisted import deploy from Unicode import UnicodeResource -import twisted.web.server -import twisted.internet.reactor -# Special magic incantation. - -top_level = Twisted.Dispatcher(UnicodeResource()) -site = twisted.web.server.Site(top_level) -twisted.internet.reactor.listenTCP(8080, site) print "Serving..." -twisted.internet.reactor.run() +deploy(UnicodeResource()) # vim: tabstop=4 expandtab shiftwidth=4