SESPRINGPYTHONPY-149: Merged to latest master. Added Sphinx docs.

.pydevproject

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?>
 
 <pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/springpython/src</path>
 <path>/springpython/samples/petclinic</path>
@@ -11,4 +11,5 @@
 <path>/springpython/test</path>
 <path>/springpython/samples/basic</path>
 </pydev_pathproperty>
-</pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">sp</pydev_property>
+</pydev_project>

dependencies/.gitignore

@@ -0,0 +1,3 @@
+CherryPy-*/
+PyYAML-*/
+Pyro-*/

docs/.gitignore

@@ -0,0 +1 @@
+sphinx

docs/reference/src/dao.xml

@@ -248,8 +248,8 @@ results = dt.query("select title, air_date, episode_number, writer from tv_shows
 		<section id="dao-databasetemplate-jdbctemplate">
 			<title>Have you used Spring Framework's JdbcTemplate?</title>
 
-			<para>If you are a user of Java's <ulink url="http://www.springsource.org">Spring framework</ulink>
-			and have used the <ulink url="http://static.springsource.org/spring/docs/1.2.x/api/org/springframework/jdbc/core/JdbcTemplate.html">
+			<para>If you are a user of Java's <ulink url="http://www.springframework.org">Spring framework</ulink>
+			and have used the <ulink url="http://static.springframework.org/spring/docs/1.2.x/api/org/springframework/jdbc/core/JdbcTemplate.html">
 			JdbcTemplate</ulink>, then you will find this template has a familiar feel.</para>
 
 			<table id="dao-databasetemplate-jdbctemplate-ops">

docs/reference/src/overview.xml

@@ -123,33 +123,13 @@
 
    	<section id="overview-support">
   		<title>Support</title>
-
-		<section id="overview-support-book">
-			<title>Spring Python 1.1 book</title>
-
-
-        <para><inlinemediaobject>
-                <imageobject role="fo">
-                        <imagedata align="right" fileref="images/0660_small.jpg"
-                                format="JPG" scale="10%" width="10%"/>
-                </imageobject>
-                <imageobject role="html">
-                        <imagedata align="center" fileref="images/0660_small.jpg"
-                                format="10" scale="10%" width="25%"/>
-                </imageobject>
-        </inlinemediaobject></para>
-
-			<para>You can order either a printed or electronic version of the <ulink url="https://www.packtpub.com/create-powerful-versatile-spring-python-1-1-applications/book">Spring Python 1.1 book</ulink> written by project creator Greg Turnquist. This contains a lot of code samples, diagrams, and descriptions of the concepts behind Spring Python. This book was completed right as Spring Python 1.1 was released, and 1.2.x was started, so it contains up-to-date information on the project.</para>
-
-
-		</section>
 
 		<section id="overview-support-forums">
 			<title>Forums and Email</title>
 
 				<itemizedlist>
 					<listitem><para>You can read the messages on <ulink
-					url="http://forum.springsource.org/forumdisplay.php?f=45">
+					url="http://forum.springframework.org/forumdisplay.php?f=45">
 					Spring Python's forums</ulink> at the official Spring forum site.</para></listitem>
 
 					<listitem><para>If you are interested, you can sign up for the <ulink
@@ -171,29 +151,30 @@
 
 		<section id="overview-support-irc">
 			<title>IRC</title>
-			<para>Join us on the #springpython IRC channel at <ulink url="http://freenode.net">Freenode</ulink>.</para>
+				<para>Sorry, I can't seem to get a long-term running IRC bot working
+				for me. You'll have to resort to email to reach me for questions or
+				issues. -- Greg</para>
 		</section>
   	</section>
 
   	<section id="overview-downloads">
   		<title>Downloads / Source Code</title>
 
   		<para>If you want a release, check out
-  		<ulink url="http://www.springsource.com/download/community?project=Spring%20Python">Spring's download site for Spring Python</ulink>.</para>
+  		<ulink url="http://s3browse.com/explore/dist.springframework.org/release/EXT/se-springpython-py/">Spring's download site for Spring Python</ulink>.</para>
 
-		<para>Spring Python has migrated to <ulink url="http://book.git-scm.com/index.html">git</ulink>, the distributed version control system. If you want the latest source code type:
+		<para>If you want the latest source code type:
 
 <programlisting><![CDATA[
-git clone git://git.springsource.org/spring-python/spring-python.git
+svn co https://src.springframework.org/svn/se-springpython-py/trunk/springpython
 ]]></programlisting>
-
+		
 		</para>
 
-		<para>That will create a new <emphasis>spring-python</emphasis> folder containing the entire repository. This includes both the source code and
-		the demo applications (PetClinic and SpringWiki). You will be on the master branch. From there, you can switch to various branches the
-		team is working on, or create your own branch to experiment and develop patches.</para>
+		<para>That will create a new <emphasis>springpython</emphasis> folder. This includes both the source code and
+		the demo applications (PetClinic and SpringWiki).</para>
 
-		<para>You can browse the code at <ulink url="https://fisheye.springsource.org/browse/se-springpython-py"/>.</para>
+		<para>You can browse the code at <ulink url="https://fisheye.springframework.org/browse/se-springpython-py"/>.</para>
   	</section>
 
   	<section id="overview-license">
@@ -210,8 +191,9 @@ git clone git://git.springsource.org/spring-python/spring-python.git
 
 		<itemizedlist>
 			<listitem><para>Project Lead: Greg L. Turnquist</para></listitem>
-            		<listitem><para>Project Contributor: Dariusz Suchojad</para></listitem>
-            		<listitem><para>Project Contributor: Sven Wilhelm</para></listitem>
+			<listitem><para>SpringSource Sponsor: Mark Pollack</para></listitem>
+			<listitem><para>Project Contributor: Russ Miles</para></listitem>
+            <listitem><para>Project Contributor: Dariusz Suchojad</para></listitem>
 		</itemizedlist>
 
 		<para>Many others have also contributed through reporting issues, raising questions, and even
@@ -227,11 +209,11 @@ git clone git://git.springsource.org/spring-python/spring-python.git
 			granting you any committer rights. You can checkout a copy of the code anonymously,
 			and then work on your patch. Email your patch to one of the official team members, and we
 			will inspect things. From there we will consider committing your patch, or send you feedback.</para>
-
-			<para>Before sending us a patch, we ask you to sign the <ulink url="https://support.springsource.com/spring_committer_signup">
-			SpringSource Individual Contributor Agreement</ulink>.</para>
 
-			<para>After a few patches, if things are looking good, we may evaluate giving you committer rights.</para>
+			<para>If we decide to commit your changes, we may choose to create a new branch for your
+			feature, based on the scope of the work, or simply commit it to the trunk. After testing,
+			evaluation, and prioritization, we may eventually merge your patch to the trunk. After a few
+			patches, if	things are looking good, we will evaluate giving you committer rights.</para>
 
 			<para>Spring Python is a <ulink url="http://en.wikipedia.org/wiki/Test-driven_development">
 			TDD-based</ulink> project, meaning if you are working on code, be sure to write an automated
@@ -256,7 +238,7 @@ git clone git://git.springsource.org/spring-python/spring-python.git
 				</listitem>
 				<listitem>
 					<para>Second, I suggest you register for a
-					<ulink url="http://jira.springsource.org">jira account</ulink>, so you can leave
+					<ulink url="http://jira.springframework.org">jira account</ulink>, so you can leave
 					comments, etc. on the ticket. I think that works (I don't manage jira, so if
 					it doesn't let me know, and we will work from there) NOTE: I like notes and
 					comments tracking what you have done, or what you think needs to be done. It
@@ -266,10 +248,10 @@ git clone git://git.springsource.org/spring-python/spring-python.git
 				</listitem>
 				<listitem>
 					<para>Third, register at the <ulink
-					url="http://forum.springsource.org">
+					url="http://forum.springframework.org">
 					SpringSource community forum</ulink>, and if you want to kick
 					ideas around or float a concept, feel free to start a thread in our <ulink
-					url="http://forum.springsource.org/forumdisplay.php?f=45">Spring Python
+					url="http://forum.springframework.org/forumdisplay.php?f=45">Spring Python
 					forum</ulink>.</para>
 				</listitem>
 				<listitem>

generate_site.bash

@@ -26,7 +26,7 @@ export M2_HOME=~/apache-maven
 export M2=$M2_HOME/bin
 export PATH=$M2:$JAVA_HOME/bin:$PATH
 
-cd ~/spring-python-1.2.x
-git pull
+cd ~/springpython-1.1.x
+svn update
 ./build.py --clean --docs-all --pydoc
 

samples/.gitignore

@@ -0,0 +1 @@
+setup.py

samples/build.py

@@ -41,7 +41,7 @@
       classifiers=["License :: OSI Approved :: GNU General Public License (GPL)",
                    "License :: OSI Approved :: Apache Software License",
                    "Intended Audience :: Developers",
-                   "Development Status :: 4 - Beta",
+                   "Development Status :: 5 - Production/Stable",
                    "Topic :: Software Development :: Libraries :: Python Modules",
                    "Programming Language :: Python",
                    "Operating System :: OS Independent"

samples/springwiki/noxml.py

@@ -47,33 +47,33 @@ def userDetailsService2(self):
 
     @Object
     def plainEncoder(self):
-        return PlaintextPasswordEncoder()
+        return PlaintextPasswordEncoder()
 
     @Object
     def plainAuthenticationProvider(self):
         provider = DaoAuthenticationProvider()
         provider.user_details_service = self.userDetailsService2()
         provider.password_encoder = self.plainEncoder()
         return provider
-
+
 
     @Object
     def authenticationManager(self):
         manager = AuthenticationManager()
         manager.auth_providers = [self.plainAuthenticationProvider()]
         return manager
-
+
     @Object
     def authenticationProcessingFilter(self):
         filter = AuthenticationProcessingFilter()
         filter.auth_manager = self.authenticationManager()
         filter.alwaysReauthenticate = False
         return filter
-
+
     @Object
     def cherrypySessionStrategy(self):
         return CP3SessionStrategy()
-
+
     @Object
     def redirectStrategy(self):
         return CP3RedirectStrategy()
@@ -89,20 +89,20 @@ def authenticationProcessingFilterEntryPoint(self):
         filter_point = AuthenticationProcessingFilterEntryPoint()
         filter_point.loginFormUrl = "/login"
         filter_point.redirectStrategy = self.redirectStrategy()
-        return filter_point	
+        return filter_point	
     @Object
     def accessDeniedHandler(self):
         handler = SimpleAccessDeniedHandler()
         handler.errorPage = "/accessDenied"
         handler.redirectStrategy = self.redirectStrategy()
-        return handler
+        return handler
 
     @Object
     def exceptionTranslationFilter(self):
         filter = ExceptionTranslationFilter()
         filter.authenticationEntryPoint = self.authenticationProcessingFilterEntryPoint()
         filter.accessDeniedHandler = self.accessDeniedHandler()
-        return filter
+        return filter
 
     @Object
     def filterSecurityInterceptor(self):
@@ -112,13 +112,13 @@ def filterSecurityInterceptor(self):
         interceptor.access_decision_mgr = self.accessDecisionManager()
         interceptor.sessionStrategy = self.cherrypySessionStrategy()
         interceptor.obj_def_source = [("/.*", ["VET_ANY", "CUSTOMER_ANY"])]
-        return interceptor
+        return interceptor
 
     @Object
     def vetRoleVoter(self):
         voter = RoleVoter()
         voter.role_prefix = "VET"
-        return voter
+        return voter
 
     @Object
     def customerRoleVoter(self):
@@ -131,7 +131,7 @@ def accessDecisionManager(self):
         policy = AffirmativeBased()
         policy.allow_if_all_abstain = False
         policy.access_decision_voters = [self.vetRoleVoter(), self.customerRoleVoter()]
-        return policy
+        return policy
 
     @Object
     def filterChainProxy(self):
@@ -145,7 +145,7 @@ def filterChainProxy(self):
                                     "authenticationProcessingFilter",
                                     "filterSecurityInterceptor"]
                                  )]
-        return proxy
+        return proxy
 
     @Object
     def loginForm(self):
@@ -155,5 +155,5 @@ def loginForm(self):
         form.authenticationManager = self.authenticationManager()
         form.redirectStrategy = self.redirectStrategy()
         form.httpContextFilter = self.httpContextFilter()
-        return form
+        return form
 

springpython.properties

@@ -9,11 +9,11 @@ release.type=snapshot
 
 # This property is only un-commented and set for official tagged releases.
 #release.type=release
-#build.stamp=RC2
+#build.stamp=FINAL
 
 # This property is uncommented for milestone releases.
 #release.type=milestone
-#build.stamp=M1
+#build.stamp=RC1
 
 # docbook reference documentation
 doc.ref.dir=docs/reference

src/.gitignore

@@ -0,0 +1 @@
+setup.py

src/build.py

@@ -12,11 +12,15 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.       
+   limitations under the License.
 """
 import re
 import sys
-from distutils.core import setup
+
+try:
+    from distribute.core import setup
+except ImportError:
+    from setuptools import setup
 
 if sys.version_info < (2, 4):
     print "Spring Python only supports Python 2.4 and higher"
@@ -32,17 +36,17 @@
       platforms = ["Python >= 2.4"],
       license='Apache Software License (http://www.apache.org/licenses/LICENSE-2.0)',
       scripts=['plugins/coily'],
-      packages=['springpython', 
+      packages=['springpython',
                 'springpython.aop',
-                'springpython.jms', 
+                'springpython.jms',
                 'springpython.config',
                 'springpython.container',
                 'springpython.context',
-                'springpython.database', 
-                'springpython.factory', 
-                'springpython.remoting', 
-                'springpython.remoting.hessian', 
-                'springpython.remoting.pyro', 
+                'springpython.database',
+                'springpython.factory',
+                'springpython.remoting',
+                'springpython.remoting.hessian',
+                'springpython.remoting.pyro',
                 'springpython.security',
                 'springpython.security.context',
                 'springpython.security.providers',
@@ -52,11 +56,11 @@
       download_url="${download_url}",
       classifiers=["License :: OSI Approved :: Apache Software License",
                    "Intended Audience :: Developers",
-                   "Development Status :: 4 - Beta",
+                   "Development Status :: 5 - Production/Stable",
                    "Topic :: Software Development :: Libraries :: Python Modules",
                    "Programming Language :: Python",
                    "Operating System :: OS Independent"
                    ]
-      
+
      )
 

src/plugins/gen-cherrypy-app/cherrypy-app.py

@@ -45,7 +45,7 @@
 
     conf = {'/': 	{"tools.staticdir.root": os.getcwd(),
                          "tools.sessions.on": True,
-                         "tools.filterChainProxy.on": True},
+                         "tools.securityFilterChain.on": True},
             "/images": 	{"tools.staticdir.on": True,
                          "tools.staticdir.dir": "images"}
             }