1.1 --- a/examples/JavaServlet/AuthApp.py Sun Jan 15 23:22:09 2006 +0000
1.2 +++ b/examples/JavaServlet/AuthApp.py Sun Jan 15 23:22:13 2006 +0000
1.3 @@ -1,15 +1,8 @@
1.4 #!/usr/bin/env python
1.5
1.6 -from WebStack.Adapters import JavaServlet
1.7 +from WebStack.Adapters.JavaServlet import deploy
1.8 from Auth import AuthResource, AuthAuthenticator
1.9 -from javax.servlet.http import HttpServlet
1.10
1.11 -class AuthApp(HttpServlet):
1.12 - def __init__(self):
1.13 - HttpServlet.__init__(self)
1.14 - self.dispatcher = JavaServlet.Dispatcher(AuthResource(), AuthAuthenticator())
1.15 -
1.16 - def service(self, request, response):
1.17 - self.dispatcher.service(request, response)
1.18 +AuthApp = deploy(AuthResource(), AuthAuthenticator())
1.19
1.20 # vim: tabstop=4 expandtab shiftwidth=4
2.1 --- a/examples/JavaServlet/CalendarApp.py Sun Jan 15 23:22:09 2006 +0000
2.2 +++ b/examples/JavaServlet/CalendarApp.py Sun Jan 15 23:22:13 2006 +0000
2.3 @@ -1,19 +1,9 @@
2.4 #!/usr/bin/env python
2.5
2.6 -from WebStack.Adapters import JavaServlet
2.7 +from WebStack.Adapters.JavaServlet import deploy
2.8 from Calendar import CalendarResource
2.9 -from javax.servlet.http import HttpServlet
2.10 -
2.11 -class CalendarApp(HttpServlet):
2.12 - def __init__(self):
2.13 - HttpServlet.__init__(self)
2.14
2.15 - # Choose or customise one of the following if the example fails.
2.16 -
2.17 - self.dispatcher = JavaServlet.Dispatcher(CalendarResource())
2.18 - #self.dispatcher = JavaServlet.Dispatcher(CalendarResource("iso-8859-1"))
2.19 -
2.20 - def service(self, request, response):
2.21 - self.dispatcher.service(request, response)
2.22 +CalendarApp = deploy(CalendarResource())
2.23 +#CalendarApp = deploy(CalendarResource("iso-8859-1"))
2.24
2.25 # vim: tabstop=4 expandtab shiftwidth=4
3.1 --- a/examples/JavaServlet/CookiesApp.py Sun Jan 15 23:22:09 2006 +0000
3.2 +++ b/examples/JavaServlet/CookiesApp.py Sun Jan 15 23:22:13 2006 +0000
3.3 @@ -1,15 +1,8 @@
3.4 #!/usr/bin/env python
3.5
3.6 -from WebStack.Adapters import JavaServlet
3.7 +from WebStack.Adapters.JavaServlet import deploy
3.8 from Cookies import CookiesResource
3.9 -from javax.servlet.http import HttpServlet
3.10
3.11 -class CookiesApp(HttpServlet):
3.12 - def __init__(self):
3.13 - HttpServlet.__init__(self)
3.14 - self.dispatcher = JavaServlet.Dispatcher(CookiesResource())
3.15 -
3.16 - def service(self, request, response):
3.17 - self.dispatcher.service(request, response)
3.18 +CookiesApp = deploy(CookiesResource())
3.19
3.20 # vim: tabstop=4 expandtab shiftwidth=4
4.1 --- a/examples/JavaServlet/FormApp.py Sun Jan 15 23:22:09 2006 +0000
4.2 +++ b/examples/JavaServlet/FormApp.py Sun Jan 15 23:22:13 2006 +0000
4.3 @@ -1,15 +1,8 @@
4.4 #!/usr/bin/env python
4.5
4.6 -from WebStack.Adapters import JavaServlet
4.7 +from WebStack.Adapters.JavaServlet import deploy
4.8 from Form import FormResource
4.9 -from javax.servlet.http import HttpServlet
4.10
4.11 -class FormApp(HttpServlet):
4.12 - def __init__(self):
4.13 - HttpServlet.__init__(self)
4.14 - self.dispatcher = JavaServlet.Dispatcher(FormResource())
4.15 -
4.16 - def service(self, request, response):
4.17 - self.dispatcher.service(request, response)
4.18 +FormApp = deploy(FormResource())
4.19
4.20 # vim: tabstop=4 expandtab shiftwidth=4
5.1 --- a/examples/JavaServlet/LoginApp.py Sun Jan 15 23:22:09 2006 +0000
5.2 +++ b/examples/JavaServlet/LoginApp.py Sun Jan 15 23:22:13 2006 +0000
5.3 @@ -1,8 +1,7 @@
5.4 #!/usr/bin/env python
5.5
5.6 -from WebStack.Adapters import JavaServlet
5.7 +from WebStack.Adapters.JavaServlet import deploy
5.8 from WebStack.Resources.Login import LoginResource, LoginAuthenticator
5.9 -from javax.servlet.http import HttpServlet
5.10
5.11 # NOTE: Not sure if the resource should be maintained in a resource pool.
5.12
5.13 @@ -17,13 +16,6 @@
5.14 use_redirect=0
5.15 )
5.16
5.17 -class LoginApp(HttpServlet):
5.18 - def __init__(self):
5.19 - global resource
5.20 - HttpServlet.__init__(self)
5.21 - self.dispatcher = JavaServlet.Dispatcher(resource)
5.22 -
5.23 - def service(self, request, response):
5.24 - self.dispatcher.service(request, response)
5.25 +LoginApp = deploy(resource)
5.26
5.27 # vim: tabstop=4 expandtab shiftwidth=4
6.1 --- a/examples/JavaServlet/SessionsApp.py Sun Jan 15 23:22:09 2006 +0000
6.2 +++ b/examples/JavaServlet/SessionsApp.py Sun Jan 15 23:22:13 2006 +0000
6.3 @@ -1,15 +1,8 @@
6.4 #!/usr/bin/env python
6.5
6.6 -from WebStack.Adapters import JavaServlet
6.7 +from WebStack.Adapters.JavaServlet import deploy
6.8 from Sessions import SessionsResource
6.9 -from javax.servlet.http import HttpServlet
6.10
6.11 -class SessionsApp(HttpServlet):
6.12 - def __init__(self):
6.13 - HttpServlet.__init__(self)
6.14 - self.dispatcher = JavaServlet.Dispatcher(SessionsResource())
6.15 -
6.16 - def service(self, request, response):
6.17 - self.dispatcher.service(request, response)
6.18 +SessionsApp = deploy(SessionsResource())
6.19
6.20 # vim: tabstop=4 expandtab shiftwidth=4
7.1 --- a/examples/JavaServlet/SimpleApp.py Sun Jan 15 23:22:09 2006 +0000
7.2 +++ b/examples/JavaServlet/SimpleApp.py Sun Jan 15 23:22:13 2006 +0000
7.3 @@ -1,15 +1,8 @@
7.4 #!/usr/bin/env python
7.5
7.6 -from WebStack.Adapters import JavaServlet
7.7 +from WebStack.Adapters.JavaServlet import deploy
7.8 from Simple import SimpleResource
7.9 -from javax.servlet.http import HttpServlet
7.10
7.11 -class SimpleApp(HttpServlet):
7.12 - def __init__(self):
7.13 - HttpServlet.__init__(self)
7.14 - self.dispatcher = JavaServlet.Dispatcher(SimpleResource())
7.15 -
7.16 - def service(self, request, response):
7.17 - self.dispatcher.service(request, response)
7.18 +SimpleApp = deploy(SimpleResource())
7.19
7.20 # vim: tabstop=4 expandtab shiftwidth=4
8.1 --- a/examples/JavaServlet/SimpleWithLoginApp.py Sun Jan 15 23:22:09 2006 +0000
8.2 +++ b/examples/JavaServlet/SimpleWithLoginApp.py Sun Jan 15 23:22:13 2006 +0000
8.3 @@ -1,9 +1,8 @@
8.4 #!/usr/bin/env python
8.5
8.6 -from WebStack.Adapters import JavaServlet
8.7 +from WebStack.Adapters.JavaServlet import deploy
8.8 from Simple import SimpleResource
8.9 from WebStack.Resources.LoginRedirect import LoginRedirectResource, LoginRedirectAuthenticator
8.10 -from javax.servlet.http import HttpServlet
8.11
8.12 # NOTE: Not sure if the resource should be maintained in a resource pool.
8.13
8.14 @@ -16,13 +15,6 @@
8.15 logout_parameter_name="logout"
8.16 )
8.17
8.18 -class SimpleWithLoginApp(HttpServlet):
8.19 - def __init__(self):
8.20 - global resource
8.21 - HttpServlet.__init__(self)
8.22 - self.dispatcher = JavaServlet.Dispatcher(resource)
8.23 -
8.24 - def service(self, request, response):
8.25 - self.dispatcher.service(request, response)
8.26 +SimpleWithLoginApp = deploy(resource)
8.27
8.28 # vim: tabstop=4 expandtab shiftwidth=4
9.1 --- a/examples/JavaServlet/UnicodeApp.py Sun Jan 15 23:22:09 2006 +0000
9.2 +++ b/examples/JavaServlet/UnicodeApp.py Sun Jan 15 23:22:13 2006 +0000
9.3 @@ -1,15 +1,8 @@
9.4 #!/usr/bin/env python
9.5
9.6 -from WebStack.Adapters import JavaServlet
9.7 +from WebStack.Adapters.JavaServlet import deploy
9.8 from Unicode import UnicodeResource
9.9 -from javax.servlet.http import HttpServlet
9.10
9.11 -class UnicodeApp(HttpServlet):
9.12 - def __init__(self):
9.13 - HttpServlet.__init__(self)
9.14 - self.dispatcher = JavaServlet.Dispatcher(UnicodeResource())
9.15 -
9.16 - def service(self, request, response):
9.17 - self.dispatcher.service(request, response)
9.18 +UnicodeApp = deploy(UnicodeResource())
9.19
9.20 # vim: tabstop=4 expandtab shiftwidth=4
10.1 --- a/examples/JavaServlet/VerySimpleApp.py Sun Jan 15 23:22:09 2006 +0000
10.2 +++ b/examples/JavaServlet/VerySimpleApp.py Sun Jan 15 23:22:13 2006 +0000
10.3 @@ -1,15 +1,8 @@
10.4 #!/usr/bin/env python
10.5
10.6 -from WebStack.Adapters import JavaServlet
10.7 +from WebStack.Adapters.JavaServlet import deploy
10.8 from VerySimple import VerySimpleResource
10.9 -from javax.servlet.http import HttpServlet
10.10
10.11 -class VerySimpleApp(HttpServlet):
10.12 - def __init__(self):
10.13 - HttpServlet.__init__(self)
10.14 - self.dispatcher = JavaServlet.Dispatcher(VerySimpleResource())
10.15 -
10.16 - def service(self, request, response):
10.17 - self.dispatcher.service(request, response)
10.18 +VerySimpleApp = deploy(VerySimpleResource())
10.19
10.20 # vim: tabstop=4 expandtab shiftwidth=4