1.1 --- a/examples/BaseHTTPRequestHandler/AuthApp.py Thu Mar 24 17:40:50 2005 +0000 1.2 +++ b/examples/BaseHTTPRequestHandler/AuthApp.py Thu Mar 24 17:41:03 2005 +0000 1.3 @@ -1,15 +1,9 @@ 1.4 #!/usr/bin/env python 1.5 1.6 -from WebStack.Adapters import BaseHTTPRequestHandler 1.7 +from WebStack.Adapters.BaseHTTPRequestHandler import deploy 1.8 from Auth import AuthResource, AuthAuthenticator 1.9 -import BaseHTTPServer 1.10 - 1.11 -# Special magic incantation. 1.12 1.13 -handler = BaseHTTPRequestHandler.HandlerFactory(AuthResource(), AuthAuthenticator()) 1.14 -address = ("", 8080) 1.15 -server = BaseHTTPServer.HTTPServer(address, handler) 1.16 print "Serving..." 1.17 -server.serve_forever() 1.18 +deploy(AuthResource(), AuthAuthenticator()) 1.19 1.20 # vim: tabstop=4 expandtab shiftwidth=4
2.1 --- a/examples/BaseHTTPRequestHandler/CalendarApp.py Thu Mar 24 17:40:50 2005 +0000 2.2 +++ b/examples/BaseHTTPRequestHandler/CalendarApp.py Thu Mar 24 17:41:03 2005 +0000 2.3 @@ -1,15 +1,9 @@ 2.4 #!/usr/bin/env python 2.5 2.6 -from WebStack.Adapters import BaseHTTPRequestHandler 2.7 +from WebStack.Adapters.BaseHTTPRequestHandler import deploy 2.8 from Calendar import DirectoryResource 2.9 -import BaseHTTPServer 2.10 - 2.11 -# Special magic incantation. 2.12 2.13 -handler = BaseHTTPRequestHandler.HandlerFactory(DirectoryResource()) 2.14 -address = ("", 8080) 2.15 -server = BaseHTTPServer.HTTPServer(address, handler) 2.16 print "Serving..." 2.17 -server.serve_forever() 2.18 +deploy(DirectoryResource()) 2.19 2.20 # vim: tabstop=4 expandtab shiftwidth=4
3.1 --- a/examples/BaseHTTPRequestHandler/CookiesApp.py Thu Mar 24 17:40:50 2005 +0000 3.2 +++ b/examples/BaseHTTPRequestHandler/CookiesApp.py Thu Mar 24 17:41:03 2005 +0000 3.3 @@ -1,15 +1,9 @@ 3.4 #!/usr/bin/env python 3.5 3.6 -from WebStack.Adapters import BaseHTTPRequestHandler 3.7 +from WebStack.Adapters.BaseHTTPRequestHandler import deploy 3.8 from Cookies import CookiesResource 3.9 -import BaseHTTPServer 3.10 - 3.11 -# Special magic incantation. 3.12 3.13 -handler = BaseHTTPRequestHandler.HandlerFactory(CookiesResource()) 3.14 -address = ("", 8080) 3.15 -server = BaseHTTPServer.HTTPServer(address, handler) 3.16 print "Serving..." 3.17 -server.serve_forever() 3.18 +deploy(CookiesResource()) 3.19 3.20 # vim: tabstop=4 expandtab shiftwidth=4
4.1 --- a/examples/BaseHTTPRequestHandler/FormApp.py Thu Mar 24 17:40:50 2005 +0000 4.2 +++ b/examples/BaseHTTPRequestHandler/FormApp.py Thu Mar 24 17:41:03 2005 +0000 4.3 @@ -1,15 +1,9 @@ 4.4 #!/usr/bin/env python 4.5 4.6 -from WebStack.Adapters import BaseHTTPRequestHandler 4.7 +from WebStack.Adapters.BaseHTTPRequestHandler import deploy 4.8 from Form import FormResource 4.9 -import BaseHTTPServer 4.10 - 4.11 -# Special magic incantation. 4.12 4.13 -handler = BaseHTTPRequestHandler.HandlerFactory(FormResource()) 4.14 -address = ("", 8080) 4.15 -server = BaseHTTPServer.HTTPServer(address, handler) 4.16 print "Serving..." 4.17 -server.serve_forever() 4.18 +deploy(FormResource()) 4.19 4.20 # vim: tabstop=4 expandtab shiftwidth=4
5.1 --- a/examples/BaseHTTPRequestHandler/LoginApp.py Thu Mar 24 17:40:50 2005 +0000 5.2 +++ b/examples/BaseHTTPRequestHandler/LoginApp.py Thu Mar 24 17:41:03 2005 +0000 5.3 @@ -1,12 +1,10 @@ 5.4 #!/usr/bin/env python 5.5 5.6 -from WebStack.Adapters import BaseHTTPRequestHandler 5.7 +from WebStack.Adapters.BaseHTTPRequestHandler import deploy 5.8 from WebStack.Resources.Login import LoginResource, LoginAuthenticator 5.9 -import BaseHTTPServer 5.10 5.11 -# Special magic incantation. 5.12 - 5.13 -handler = BaseHTTPRequestHandler.HandlerFactory( 5.14 +print "Serving..." 5.15 +deploy( 5.16 LoginResource( 5.17 LoginAuthenticator( 5.18 secret_key="horses", 5.19 @@ -15,11 +13,8 @@ 5.20 ("vole", "xyz"), 5.21 ) 5.22 ) 5.23 - ) 5.24 + ), 5.25 + address=("", 8081) 5.26 ) 5.27 -address = ("", 8081) 5.28 -server = BaseHTTPServer.HTTPServer(address, handler) 5.29 -print "Serving..." 5.30 -server.serve_forever() 5.31 5.32 # vim: tabstop=4 expandtab shiftwidth=4
6.1 --- a/examples/BaseHTTPRequestHandler/SessionsApp.py Thu Mar 24 17:40:50 2005 +0000 6.2 +++ b/examples/BaseHTTPRequestHandler/SessionsApp.py Thu Mar 24 17:41:03 2005 +0000 6.3 @@ -1,15 +1,9 @@ 6.4 #!/usr/bin/env python 6.5 6.6 -from WebStack.Adapters import BaseHTTPRequestHandler 6.7 +from WebStack.Adapters.BaseHTTPRequestHandler import deploy 6.8 from Sessions import SessionsResource 6.9 -import BaseHTTPServer 6.10 - 6.11 -# Special magic incantation. 6.12 6.13 -handler = BaseHTTPRequestHandler.HandlerFactory(SessionsResource()) 6.14 -address = ("", 8080) 6.15 -server = BaseHTTPServer.HTTPServer(address, handler) 6.16 print "Serving..." 6.17 -server.serve_forever() 6.18 +deploy(SessionsResource()) 6.19 6.20 # vim: tabstop=4 expandtab shiftwidth=4
7.1 --- a/examples/BaseHTTPRequestHandler/SimpleApp.py Thu Mar 24 17:40:50 2005 +0000 7.2 +++ b/examples/BaseHTTPRequestHandler/SimpleApp.py Thu Mar 24 17:41:03 2005 +0000 7.3 @@ -1,15 +1,11 @@ 7.4 #!/usr/bin/env python 7.5 7.6 -from WebStack.Adapters import BaseHTTPRequestHandler 7.7 +from WebStack.Adapters.BaseHTTPRequestHandler import deploy 7.8 from Simple import SimpleResource 7.9 -import BaseHTTPServer 7.10 7.11 # Special magic incantation. 7.12 7.13 -handler = BaseHTTPRequestHandler.HandlerFactory(SimpleResource()) 7.14 -address = ("", 8080) 7.15 -server = BaseHTTPServer.HTTPServer(address, handler) 7.16 print "Serving..." 7.17 -server.serve_forever() 7.18 +deploy(SimpleResource()) 7.19 7.20 # vim: tabstop=4 expandtab shiftwidth=4
8.1 --- a/examples/BaseHTTPRequestHandler/SimpleWithLoginApp.py Thu Mar 24 17:40:50 2005 +0000 8.2 +++ b/examples/BaseHTTPRequestHandler/SimpleWithLoginApp.py Thu Mar 24 17:41:03 2005 +0000 8.3 @@ -1,13 +1,11 @@ 8.4 #!/usr/bin/env python 8.5 8.6 -from WebStack.Adapters import BaseHTTPRequestHandler 8.7 +from WebStack.Adapters.BaseHTTPRequestHandler import deploy 8.8 from WebStack.Resources.LoginRedirect import LoginRedirectResource, LoginRedirectAuthenticator 8.9 from Simple import SimpleResource 8.10 -import BaseHTTPServer 8.11 8.12 -# Special magic incantation. 8.13 - 8.14 -handler = BaseHTTPRequestHandler.HandlerFactory( 8.15 +print "Serving..." 8.16 +deploy( 8.17 LoginRedirectResource( 8.18 login_url="http://localhost:8081", 8.19 app_url="http://localhost:8080", 8.20 @@ -17,9 +15,5 @@ 8.21 logout_parameter_name="logout" 8.22 ) 8.23 ) 8.24 -address = ("", 8080) 8.25 -server = BaseHTTPServer.HTTPServer(address, handler) 8.26 -print "Serving..." 8.27 -server.serve_forever() 8.28 8.29 # vim: tabstop=4 expandtab shiftwidth=4
9.1 --- a/examples/BaseHTTPRequestHandler/UnicodeApp.py Thu Mar 24 17:40:50 2005 +0000 9.2 +++ b/examples/BaseHTTPRequestHandler/UnicodeApp.py Thu Mar 24 17:41:03 2005 +0000 9.3 @@ -1,15 +1,9 @@ 9.4 #!/usr/bin/env python 9.5 9.6 -from WebStack.Adapters import BaseHTTPRequestHandler 9.7 +from WebStack.Adapters.BaseHTTPRequestHandler import deploy 9.8 from Unicode import UnicodeResource 9.9 -import BaseHTTPServer 9.10 - 9.11 -# Special magic incantation. 9.12 9.13 -handler = BaseHTTPRequestHandler.HandlerFactory(UnicodeResource()) 9.14 -address = ("", 8080) 9.15 -server = BaseHTTPServer.HTTPServer(address, handler) 9.16 print "Serving..." 9.17 -server.serve_forever() 9.18 +deploy(UnicodeResource()) 9.19 9.20 # vim: tabstop=4 expandtab shiftwidth=4
10.1 --- a/examples/CGI/CookiesHandler.py Thu Mar 24 17:40:50 2005 +0000 10.2 +++ b/examples/CGI/CookiesHandler.py Thu Mar 24 17:41:03 2005 +0000 10.3 @@ -6,10 +6,9 @@ 10.4 sys.path.append("/home/paulb/Software/Python/WebStack") 10.5 sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") 10.6 10.7 -from WebStack.Adapters import CGI 10.8 +from WebStack.Adapters.CGI import deploy 10.9 from Cookies import CookiesResource 10.10 10.11 -resource = CookiesResource() 10.12 -CGI.respond(resource) 10.13 +deploy(CookiesResource()) 10.14 10.15 # vim: tabstop=4 expandtab shiftwidth=4
11.1 --- a/examples/CGI/FormHandler.py Thu Mar 24 17:40:50 2005 +0000 11.2 +++ b/examples/CGI/FormHandler.py Thu Mar 24 17:41:03 2005 +0000 11.3 @@ -6,10 +6,9 @@ 11.4 sys.path.append("/home/paulb/Software/Python/WebStack") 11.5 sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") 11.6 11.7 -from WebStack.Adapters import CGI 11.8 +from WebStack.Adapters.CGI import deploy 11.9 from Form import FormResource 11.10 11.11 -resource = FormResource() 11.12 -CGI.respond(resource) 11.13 +deploy(FormResource()) 11.14 11.15 # vim: tabstop=4 expandtab shiftwidth=4
12.1 --- a/examples/CGI/LoginHandler.py Thu Mar 24 17:40:50 2005 +0000 12.2 +++ b/examples/CGI/LoginHandler.py Thu Mar 24 17:41:03 2005 +0000 12.3 @@ -6,18 +6,19 @@ 12.4 sys.path.append("/home/paulb/Software/Python/WebStack") 12.5 sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") 12.6 12.7 -from WebStack.Adapters import CGI 12.8 +from WebStack.Adapters.CGI import deploy 12.9 from WebStack.Resources.Login import LoginResource, LoginAuthenticator 12.10 12.11 -resource = LoginResource( 12.12 - LoginAuthenticator( 12.13 - secret_key="horses", 12.14 - credentials=( 12.15 - ("badger", "abc"), 12.16 - ("vole", "xyz"), 12.17 +deploy( 12.18 + LoginResource( 12.19 + LoginAuthenticator( 12.20 + secret_key="horses", 12.21 + credentials=( 12.22 + ("badger", "abc"), 12.23 + ("vole", "xyz"), 12.24 + ) 12.25 ) 12.26 ) 12.27 ) 12.28 -CGI.respond(resource) 12.29 12.30 # vim: tabstop=4 expandtab shiftwidth=4
13.1 --- a/examples/CGI/SessionsHandler.py Thu Mar 24 17:40:50 2005 +0000 13.2 +++ b/examples/CGI/SessionsHandler.py Thu Mar 24 17:41:03 2005 +0000 13.3 @@ -6,10 +6,9 @@ 13.4 sys.path.append("/home/paulb/Software/Python/WebStack") 13.5 sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") 13.6 13.7 -from WebStack.Adapters import CGI 13.8 +from WebStack.Adapters.CGI import deploy 13.9 from Sessions import SessionsResource 13.10 13.11 -resource = SessionsResource() 13.12 -CGI.respond(resource) 13.13 +deploy(SessionsResource()) 13.14 13.15 # vim: tabstop=4 expandtab shiftwidth=4
14.1 --- a/examples/CGI/SimpleHandler.py Thu Mar 24 17:40:50 2005 +0000 14.2 +++ b/examples/CGI/SimpleHandler.py Thu Mar 24 17:41:03 2005 +0000 14.3 @@ -6,10 +6,9 @@ 14.4 sys.path.append("/home/paulb/Software/Python/WebStack") 14.5 sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") 14.6 14.7 -from WebStack.Adapters import CGI 14.8 +from WebStack.Adapters.CGI import deploy 14.9 from Simple import SimpleResource 14.10 14.11 -resource = SimpleResource() 14.12 -CGI.respond(resource) 14.13 +deploy(SimpleResource()) 14.14 14.15 # vim: tabstop=4 expandtab shiftwidth=4
15.1 --- a/examples/CGI/SimpleWithLoginHandler.py Thu Mar 24 17:40:50 2005 +0000 15.2 +++ b/examples/CGI/SimpleWithLoginHandler.py Thu Mar 24 17:41:03 2005 +0000 15.3 @@ -6,18 +6,19 @@ 15.4 sys.path.append("/home/paulb/Software/Python/WebStack") 15.5 sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") 15.6 15.7 -from WebStack.Adapters import CGI 15.8 +from WebStack.Adapters.CGI import deploy 15.9 from WebStack.Resources.LoginRedirect import LoginRedirectResource, LoginRedirectAuthenticator 15.10 from Simple import SimpleResource 15.11 15.12 -resource = LoginRedirectResource( 15.13 - login_url="http://localhost/cgi/login", 15.14 - app_url="http://localhost", 15.15 - resource=SimpleResource(), 15.16 - authenticator=LoginRedirectAuthenticator(secret_key="horses"), 15.17 - anonymous_parameter_name="anonymous", 15.18 - logout_parameter_name="logout" 15.19 +deploy( 15.20 + LoginRedirectResource( 15.21 + login_url="http://localhost/cgi/login", 15.22 + app_url="http://localhost", 15.23 + resource=SimpleResource(), 15.24 + authenticator=LoginRedirectAuthenticator(secret_key="horses"), 15.25 + anonymous_parameter_name="anonymous", 15.26 + logout_parameter_name="logout" 15.27 + ) 15.28 ) 15.29 -CGI.respond(resource) 15.30 15.31 # vim: tabstop=4 expandtab shiftwidth=4
16.1 --- a/examples/CGI/UnicodeHandler.py Thu Mar 24 17:40:50 2005 +0000 16.2 +++ b/examples/CGI/UnicodeHandler.py Thu Mar 24 17:41:03 2005 +0000 16.3 @@ -6,10 +6,9 @@ 16.4 sys.path.append("/home/paulb/Software/Python/WebStack") 16.5 sys.path.append("/home/paulb/Software/Python/WebStack/examples/Common") 16.6 16.7 -from WebStack.Adapters import CGI 16.8 +from WebStack.Adapters.CGI import deploy 16.9 from Unicode import UnicodeResource 16.10 16.11 -resource = UnicodeResource() 16.12 -CGI.respond(resource) 16.13 +deploy(UnicodeResource()) 16.14 16.15 # vim: tabstop=4 expandtab shiftwidth=4
17.1 --- a/examples/Twisted/AuthApp.py Thu Mar 24 17:40:50 2005 +0000 17.2 +++ b/examples/Twisted/AuthApp.py Thu Mar 24 17:41:03 2005 +0000 17.3 @@ -1,16 +1,9 @@ 17.4 #!/usr/bin/env python 17.5 17.6 -from WebStack.Adapters import Twisted 17.7 +from WebStack.Adapters.Twisted import deploy 17.8 from Auth import AuthResource, AuthAuthenticator 17.9 -import twisted.web.server 17.10 -import twisted.internet.reactor 17.11 17.12 -# Special magic incantation. 17.13 - 17.14 -top_level = Twisted.Dispatcher(AuthResource(), AuthAuthenticator()) 17.15 -site = twisted.web.server.Site(top_level) 17.16 -twisted.internet.reactor.listenTCP(8080, site) 17.17 print "Serving..." 17.18 -twisted.internet.reactor.run() 17.19 +deploy(AuthResource(), AuthAuthenticator()) 17.20 17.21 # vim: tabstop=4 expandtab shiftwidth=4
18.1 --- a/examples/Twisted/CalendarApp.py Thu Mar 24 17:40:50 2005 +0000 18.2 +++ b/examples/Twisted/CalendarApp.py Thu Mar 24 17:41:03 2005 +0000 18.3 @@ -1,16 +1,9 @@ 18.4 #!/usr/bin/env python 18.5 18.6 -from WebStack.Adapters import Twisted 18.7 +from WebStack.Adapters.Twisted import deploy 18.8 from Calendar import DirectoryResource 18.9 -import twisted.web.server 18.10 -import twisted.internet.reactor 18.11 18.12 -# Special magic incantation. 18.13 - 18.14 -top_level = Twisted.Dispatcher(DirectoryResource()) 18.15 -site = twisted.web.server.Site(top_level) 18.16 -twisted.internet.reactor.listenTCP(8080, site) 18.17 print "Serving..." 18.18 -twisted.internet.reactor.run() 18.19 +deploy(DirectoryResource()) 18.20 18.21 # vim: tabstop=4 expandtab shiftwidth=4
19.1 --- a/examples/Twisted/CookiesApp.py Thu Mar 24 17:40:50 2005 +0000 19.2 +++ b/examples/Twisted/CookiesApp.py Thu Mar 24 17:41:03 2005 +0000 19.3 @@ -1,16 +1,9 @@ 19.4 #!/usr/bin/env python 19.5 19.6 -from WebStack.Adapters import Twisted 19.7 +from WebStack.Adapters.Twisted import deploy 19.8 from Cookies import CookiesResource 19.9 -import twisted.web.server 19.10 -import twisted.internet.reactor 19.11 19.12 -# Special magic incantation. 19.13 - 19.14 -top_level = Twisted.Dispatcher(CookiesResource()) 19.15 -site = twisted.web.server.Site(top_level) 19.16 -twisted.internet.reactor.listenTCP(8080, site) 19.17 print "Serving..." 19.18 -twisted.internet.reactor.run() 19.19 +deploy(CookiesResource()) 19.20 19.21 # vim: tabstop=4 expandtab shiftwidth=4
20.1 --- a/examples/Twisted/FormApp.py Thu Mar 24 17:40:50 2005 +0000 20.2 +++ b/examples/Twisted/FormApp.py Thu Mar 24 17:41:03 2005 +0000 20.3 @@ -1,16 +1,9 @@ 20.4 #!/usr/bin/env python 20.5 20.6 -from WebStack.Adapters import Twisted 20.7 +from WebStack.Adapters.Twisted import deploy 20.8 from Form import FormResource 20.9 -import twisted.web.server 20.10 -import twisted.internet.reactor 20.11 20.12 -# Special magic incantation. 20.13 - 20.14 -top_level = Twisted.Dispatcher(FormResource()) 20.15 -site = twisted.web.server.Site(top_level) 20.16 -twisted.internet.reactor.listenTCP(8080, site) 20.17 print "Serving..." 20.18 -twisted.internet.reactor.run() 20.19 +deploy(FormResource()) 20.20 20.21 # vim: tabstop=4 expandtab shiftwidth=4
21.1 --- a/examples/Twisted/LoginApp.py Thu Mar 24 17:40:50 2005 +0000 21.2 +++ b/examples/Twisted/LoginApp.py Thu Mar 24 17:41:03 2005 +0000 21.3 @@ -1,26 +1,20 @@ 21.4 #!/usr/bin/env python 21.5 21.6 -from WebStack.Adapters import Twisted 21.7 +from WebStack.Adapters.Twisted import deploy 21.8 from WebStack.Resources.Login import LoginResource, LoginAuthenticator 21.9 -import twisted.web.server 21.10 -import twisted.internet.reactor 21.11 - 21.12 -# Special magic incantation. 21.13 21.14 -resource = LoginResource( 21.15 - LoginAuthenticator( 21.16 - secret_key="horses", 21.17 - credentials=( 21.18 - ("badger", "abc"), 21.19 - ("vole", "xyz"), 21.20 +print "Serving..." 21.21 +deploy( 21.22 + LoginResource( 21.23 + LoginAuthenticator( 21.24 + secret_key="horses", 21.25 + credentials=( 21.26 + ("badger", "abc"), 21.27 + ("vole", "xyz"), 21.28 + ) 21.29 ) 21.30 - ) 21.31 + ), 21.32 + address=("", 8081) 21.33 ) 21.34 21.35 -top_level = Twisted.Dispatcher(resource) 21.36 -site = twisted.web.server.Site(top_level) 21.37 -twisted.internet.reactor.listenTCP(8081, site) 21.38 -print "Serving..." 21.39 -twisted.internet.reactor.run() 21.40 - 21.41 # vim: tabstop=4 expandtab shiftwidth=4
22.1 --- a/examples/Twisted/SessionsApp.py Thu Mar 24 17:40:50 2005 +0000 22.2 +++ b/examples/Twisted/SessionsApp.py Thu Mar 24 17:41:03 2005 +0000 22.3 @@ -1,16 +1,9 @@ 22.4 #!/usr/bin/env python 22.5 22.6 -from WebStack.Adapters import Twisted 22.7 +from WebStack.Adapters.Twisted import deploy 22.8 from Sessions import SessionsResource 22.9 -import twisted.web.server 22.10 -import twisted.internet.reactor 22.11 22.12 -# Special magic incantation. 22.13 - 22.14 -top_level = Twisted.Dispatcher(SessionsResource()) 22.15 -site = twisted.web.server.Site(top_level) 22.16 -twisted.internet.reactor.listenTCP(8080, site) 22.17 print "Serving..." 22.18 -twisted.internet.reactor.run() 22.19 +deploy(SessionsResource()) 22.20 22.21 # vim: tabstop=4 expandtab shiftwidth=4
23.1 --- a/examples/Twisted/SimpleApp.py Thu Mar 24 17:40:50 2005 +0000 23.2 +++ b/examples/Twisted/SimpleApp.py Thu Mar 24 17:41:03 2005 +0000 23.3 @@ -1,16 +1,9 @@ 23.4 #!/usr/bin/env python 23.5 23.6 -from WebStack.Adapters import Twisted 23.7 +from WebStack.Adapters.Twisted import deploy 23.8 from Simple import SimpleResource 23.9 -import twisted.web.server 23.10 -import twisted.internet.reactor 23.11 23.12 -# Special magic incantation. 23.13 - 23.14 -top_level = Twisted.Dispatcher(SimpleResource()) 23.15 -site = twisted.web.server.Site(top_level) 23.16 -twisted.internet.reactor.listenTCP(8080, site) 23.17 print "Serving..." 23.18 -twisted.internet.reactor.run() 23.19 +deploy(SimpleResource()) 23.20 23.21 # vim: tabstop=4 expandtab shiftwidth=4
24.1 --- a/examples/Twisted/SimpleWithLoginApp.py Thu Mar 24 17:40:50 2005 +0000 24.2 +++ b/examples/Twisted/SimpleWithLoginApp.py Thu Mar 24 17:41:03 2005 +0000 24.3 @@ -1,26 +1,19 @@ 24.4 #!/usr/bin/env python 24.5 24.6 -from WebStack.Adapters import Twisted 24.7 +from WebStack.Adapters.Twisted import deploy 24.8 from WebStack.Resources.LoginRedirect import LoginRedirectResource, LoginRedirectAuthenticator 24.9 from Simple import SimpleResource 24.10 -import twisted.web.server 24.11 -import twisted.internet.reactor 24.12 24.13 -# Special magic incantation. 24.14 - 24.15 -resource = LoginRedirectResource( 24.16 - login_url="http://localhost:8081", 24.17 - app_url="http://localhost:8080", 24.18 - resource=SimpleResource(), 24.19 - authenticator=LoginRedirectAuthenticator(secret_key="horses"), 24.20 - anonymous_parameter_name="anonymous", 24.21 - logout_parameter_name="logout" 24.22 +print "Serving..." 24.23 +deploy( 24.24 + LoginRedirectResource( 24.25 + login_url="http://localhost:8081", 24.26 + app_url="http://localhost:8080", 24.27 + resource=SimpleResource(), 24.28 + authenticator=LoginRedirectAuthenticator(secret_key="horses"), 24.29 + anonymous_parameter_name="anonymous", 24.30 + logout_parameter_name="logout" 24.31 + ) 24.32 ) 24.33 24.34 -top_level = Twisted.Dispatcher(resource) 24.35 -site = twisted.web.server.Site(top_level) 24.36 -twisted.internet.reactor.listenTCP(8080, site) 24.37 -print "Serving..." 24.38 -twisted.internet.reactor.run() 24.39 - 24.40 # vim: tabstop=4 expandtab shiftwidth=4
25.1 --- a/examples/Twisted/UnicodeApp.py Thu Mar 24 17:40:50 2005 +0000 25.2 +++ b/examples/Twisted/UnicodeApp.py Thu Mar 24 17:41:03 2005 +0000 25.3 @@ -1,16 +1,9 @@ 25.4 #!/usr/bin/env python 25.5 25.6 -from WebStack.Adapters import Twisted 25.7 +from WebStack.Adapters.Twisted import deploy 25.8 from Unicode import UnicodeResource 25.9 -import twisted.web.server 25.10 -import twisted.internet.reactor 25.11 25.12 -# Special magic incantation. 25.13 - 25.14 -top_level = Twisted.Dispatcher(UnicodeResource()) 25.15 -site = twisted.web.server.Site(top_level) 25.16 -twisted.internet.reactor.listenTCP(8080, site) 25.17 print "Serving..." 25.18 -twisted.internet.reactor.run() 25.19 +deploy(UnicodeResource()) 25.20 25.21 # vim: tabstop=4 expandtab shiftwidth=4