SESPRINGPYTHONPY-128: Fixes to SpringWiki

gregturn · gregturn · commit 9ceda5df33b0 · 2010-03-16T22:44:11.000Z
git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk@750 ce8fead1-4192-4296-8608-a705134b927f
diff --git a/springpython/build.py b/springpython/build.py
@@ -409,7 +409,7 @@ def create_pydocs():
     pydoc.writedoc("springpython.remoting.pyro")
     pydoc.writedoc("springpython.remoting.pyro.PyroDaemonHolder")
     pydoc.writedoc("springpython.security")
-    pydoc.writedoc("springpython.security.cherrypy")
+    pydoc.writedoc("springpython.security.cherrypy3")
     pydoc.writedoc("springpython.security.intercept")
     pydoc.writedoc("springpython.security.context")
     pydoc.writedoc("springpython.security.context.SecurityContextHolder")
diff --git a/springpython/docs/reference/src/security.xml b/springpython/docs/reference/src/security.xml
@@ -16,10 +16,8 @@
       <section id="security-dependencies">
           <title>External dependencies</title>
           <para>
-              <classname>springpython.security.cherrypy31</classname>
-              and
-              <classname>springpython.security.web</classname>
-              packages depend on
+              <classname>springpython.security.cherrypy3</classname>
+              package depends on
               <ulink url="http://cherrypy.org/">CherryPy 3</ulink>
               being installed prior to using them. Other than that, there are
               no specific external libraries required by Spring Python's security
diff --git a/springpython/samples/springwiki/applicationContext.xml b/springpython/samples/springwiki/applicationContext.xml
@@ -45,9 +45,9 @@
 		<property name="alwaysReauthenticate">False</property>
 	</object>
 	
-	<object id="cherrypySessionStrategy" class="springpython.security.web.CP3SessionStrategy"/>
+	<object id="cherrypySessionStrategy" class="springpython.security.cherrypy3.CP3SessionStrategy"/>
 
-	<object id="redirectStrategy" class="springpython.security.web.CP3RedirectStrategy"/>
+	<object id="redirectStrategy" class="springpython.security.cherrypy3.CP3RedirectStrategy"/>
 	
 	<object id="httpContextFilter" class="springpython.security.web.HttpSessionContextIntegrationFilter">
 		<property name="sessionStrategy" ref="cherrypySessionStrategy"/>
@@ -101,7 +101,7 @@
 		</property>
 	</object>
 	
-	<object id="filterChainProxy" class="springpython.security.web.CP3FilterChainProxy">
+	<object id="filterChainProxy" class="springpython.security.cherrypy3.CP3FilterChainProxy">
 		<property name="filterInvocationDefinitionSource">
 			<list>
 				<tuple>
diff --git a/springpython/samples/springwiki/noxml.py b/springpython/samples/springwiki/noxml.py
@@ -18,6 +18,7 @@
 import view
 
 from springpython.config import *
+from springpython.security.cherrypy3 import *
 from springpython.security.web import *
 from springpython.security.providers import *
 from springpython.security.providers.dao import *
diff --git a/springpython/samples/springwiki/springwiki.py b/springpython/samples/springwiki/springwiki.py
@@ -17,7 +17,6 @@
 import cherrypy
 import logging
 import os
-from springpython.security.cherrypy31 import AuthenticationFilter, ContextSessionFilter, SecurityFilter
 from springpython.security.context import SecurityContextHolder
 from springpython.config import XMLConfig
 from springpython.context import ApplicationContext
