SESPRINGPYTHONPY-128: Made critical fix to gen-cherrypy-app so that it generates a running application.

gregturn · gregturn · commit 8d9f70c90c45 · 2010-03-16T22:36:30.000Z
git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk@749 ce8fead1-4192-4296-8608-a705134b927f
diff --git a/springpython/src/plugins/gen-cherrypy-app/app_context.py b/springpython/src/plugins/gen-cherrypy-app/app_context.py
@@ -34,9 +34,9 @@
 from springpython.security.vote import RoleVoter
 from springpython.security.web import AuthenticationProcessingFilter
 from springpython.security.web import AuthenticationProcessingFilterEntryPoint
-from springpython.security.web import CP3FilterChainProxy
-from springpython.security.web import CP3RedirectStrategy
-from springpython.security.web import CP3SessionStrategy
+from springpython.security.cherrypy3 import CP3FilterChainProxy
+from springpython.security.cherrypy3 import CP3RedirectStrategy
+from springpython.security.cherrypy3 import CP3SessionStrategy
 from springpython.security.web import ExceptionTranslationFilter
 from springpython.security.web import FilterSecurityInterceptor
 from springpython.security.web import HttpSessionContextIntegrationFilter
@@ -55,15 +55,15 @@ def root(self):
         form.hashedUserDetailsServiceList = [self.shaUserDetailsService()]
         form.authenticationManager = self.authenticationManager()
         form.redirectStrategy = self.redirectStrategy()
-	form.httpSessionContextIntegrationFilter = self.httpSessionContextIntegrationFilter()
+	form.httpContextFilter = self.httpSessionContextIntegrationFilter()
         return form
     
     @Object
     def userDetailsService(self):
         """This user details service uses a pre-built, in-memory for demonstration purposes only. Do NOT use in a
         production system!!!"""
         userDetailsService = InMemoryUserDetailsService()
-        userDetailsService.user_dict = {"jcoleman": ("password5", ["CUSTOMER_ANY"], True)}
+        userDetailsService.user_dict = {"jcoleman": ("password5", ["ROLE_ANY"], True)}
         return userDetailsService
 
     @Object
diff --git a/springpython/src/plugins/gen-cherrypy-app/cherrypy-app.py b/springpython/src/plugins/gen-cherrypy-app/cherrypy-app.py
@@ -50,7 +50,9 @@
                          "tools.staticdir.dir": "images"}
             }
 
-    cherrypy.tree.mount(applicationContext.get_object(name = "root"), '/', config=conf)
+    form = applicationContext.get_object(name = "root")
+
+    cherrypy.tree.mount(form, '/', config=conf)
 
     cherrypy.engine.start()
     cherrypy.engine.block()

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,9 @@`
`50`	`50`	`"tools.staticdir.dir": "images"}`
`51`	`51`	`}`
`52`	`52`
`53`		`- cherrypy.tree.mount(applicationContext.get_object(name = "root"), '/', config=conf)`
	`53`	`+ form = applicationContext.get_object(name = "root")`
	`54`	`+`
	`55`	`+ cherrypy.tree.mount(form, '/', config=conf)`
`54`	`56`
`55`	`57`	`cherrypy.engine.start()`
`56`	`58`	`cherrypy.engine.block()`