Skip to content

Commit d3bcb90

Browse files
author
Dariusz Suchojad
committed
SESPRINGPYTHONPY-149: Merged to latest master. Added Sphinx docs.
2 parents 6f90048 + c1add4d commit d3bcb90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1863
-1457
lines changed

‎.pydevproject

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?eclipse-pydev version="1.0"?>
33

44
<pydev_project>
5-
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
5+
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
66
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
77
<path>/springpython/src</path>
88
<path>/springpython/samples/petclinic</path>
@@ -11,4 +11,5 @@
1111
<path>/springpython/test</path>
1212
<path>/springpython/samples/basic</path>
1313
</pydev_pathproperty>
14-
</pydev_project>
14+
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">sp</pydev_property>
15+
</pydev_project>

‎dependencies/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CherryPy-*/
2+
PyYAML-*/
3+
Pyro-*/

‎docs/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sphinx

‎docs/reference/src/dao.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ results = dt.query("select title, air_date, episode_number, writer from tv_shows
248248
<section id="dao-databasetemplate-jdbctemplate">
249249
<title>Have you used Spring Framework's JdbcTemplate?</title>
250250

251-
<para>If you are a user of Java's <ulink url="http://www.springsource.org">Spring framework</ulink>
252-
and have used the <ulink url="http://static.springsource.org/spring/docs/1.2.x/api/org/springframework/jdbc/core/JdbcTemplate.html">
251+
<para>If you are a user of Java's <ulink url="http://www.springframework.org">Spring framework</ulink>
252+
and have used the <ulink url="http://static.springframework.org/spring/docs/1.2.x/api/org/springframework/jdbc/core/JdbcTemplate.html">
253253
JdbcTemplate</ulink>, then you will find this template has a familiar feel.</para>
254254

255255
<table id="dao-databasetemplate-jdbctemplate-ops">

‎docs/reference/src/images/0660_small.jpg

-102 KB
Binary file not shown.

‎docs/reference/src/overview.xml

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -123,33 +123,13 @@
123123

124124
<section id="overview-support">
125125
<title>Support</title>
126-
127-
<section id="overview-support-book">
128-
<title>Spring Python 1.1 book</title>
129-
130-
131-
<para><inlinemediaobject>
132-
<imageobject role="fo">
133-
<imagedata align="right" fileref="images/0660_small.jpg"
134-
format="JPG" scale="10%" width="10%"/>
135-
</imageobject>
136-
<imageobject role="html">
137-
<imagedata align="center" fileref="images/0660_small.jpg"
138-
format="10" scale="10%" width="25%"/>
139-
</imageobject>
140-
</inlinemediaobject></para>
141-
142-
<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>
143-
144-
145-
</section>
146126

147127
<section id="overview-support-forums">
148128
<title>Forums and Email</title>
149129

150130
<itemizedlist>
151131
<listitem><para>You can read the messages on <ulink
152-
url="http://forum.springsource.org/forumdisplay.php?f=45">
132+
url="http://forum.springframework.org/forumdisplay.php?f=45">
153133
Spring Python's forums</ulink> at the official Spring forum site.</para></listitem>
154134

155135
<listitem><para>If you are interested, you can sign up for the <ulink
@@ -171,29 +151,30 @@
171151

172152
<section id="overview-support-irc">
173153
<title>IRC</title>
174-
<para>Join us on the #springpython IRC channel at <ulink url="http://freenode.net">Freenode</ulink>.</para>
154+
<para>Sorry, I can't seem to get a long-term running IRC bot working
155+
for me. You'll have to resort to email to reach me for questions or
156+
issues. -- Greg</para>
175157
</section>
176158
</section>
177159

178160
<section id="overview-downloads">
179161
<title>Downloads / Source Code</title>
180162

181163
<para>If you want a release, check out
182-
<ulink url="http://www.springsource.com/download/community?project=Spring%20Python">Spring's download site for Spring Python</ulink>.</para>
164+
<ulink url="http://s3browse.com/explore/dist.springframework.org/release/EXT/se-springpython-py/">Spring's download site for Spring Python</ulink>.</para>
183165

184-
<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:
166+
<para>If you want the latest source code type:
185167

186168
<programlisting><![CDATA[
187-
git clone git://git.springsource.org/spring-python/spring-python.git
169+
svn co https://src.springframework.org/svn/se-springpython-py/trunk/springpython
188170
]]></programlisting>
189-
171+
190172
</para>
191173

192-
<para>That will create a new <emphasis>spring-python</emphasis> folder containing the entire repository. This includes both the source code and
193-
the demo applications (PetClinic and SpringWiki). You will be on the master branch. From there, you can switch to various branches the
194-
team is working on, or create your own branch to experiment and develop patches.</para>
174+
<para>That will create a new <emphasis>springpython</emphasis> folder. This includes both the source code and
175+
the demo applications (PetClinic and SpringWiki).</para>
195176

196-
<para>You can browse the code at <ulink url="https://fisheye.springsource.org/browse/se-springpython-py"/>.</para>
177+
<para>You can browse the code at <ulink url="https://fisheye.springframework.org/browse/se-springpython-py"/>.</para>
197178
</section>
198179

199180
<section id="overview-license">
@@ -210,8 +191,9 @@ git clone git://git.springsource.org/spring-python/spring-python.git
210191

211192
<itemizedlist>
212193
<listitem><para>Project Lead: Greg L. Turnquist</para></listitem>
213-
<listitem><para>Project Contributor: Dariusz Suchojad</para></listitem>
214-
<listitem><para>Project Contributor: Sven Wilhelm</para></listitem>
194+
<listitem><para>SpringSource Sponsor: Mark Pollack</para></listitem>
195+
<listitem><para>Project Contributor: Russ Miles</para></listitem>
196+
<listitem><para>Project Contributor: Dariusz Suchojad</para></listitem>
215197
</itemizedlist>
216198

217199
<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
227209
granting you any committer rights. You can checkout a copy of the code anonymously,
228210
and then work on your patch. Email your patch to one of the official team members, and we
229211
will inspect things. From there we will consider committing your patch, or send you feedback.</para>
230-
231-
<para>Before sending us a patch, we ask you to sign the <ulink url="https://support.springsource.com/spring_committer_signup">
232-
SpringSource Individual Contributor Agreement</ulink>.</para>
233212

234-
<para>After a few patches, if things are looking good, we may evaluate giving you committer rights.</para>
213+
<para>If we decide to commit your changes, we may choose to create a new branch for your
214+
feature, based on the scope of the work, or simply commit it to the trunk. After testing,
215+
evaluation, and prioritization, we may eventually merge your patch to the trunk. After a few
216+
patches, if things are looking good, we will evaluate giving you committer rights.</para>
235217

236218
<para>Spring Python is a <ulink url="http://en.wikipedia.org/wiki/Test-driven_development">
237219
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
256238
</listitem>
257239
<listitem>
258240
<para>Second, I suggest you register for a
259-
<ulink url="http://jira.springsource.org">jira account</ulink>, so you can leave
241+
<ulink url="http://jira.springframework.org">jira account</ulink>, so you can leave
260242
comments, etc. on the ticket. I think that works (I don't manage jira, so if
261243
it doesn't let me know, and we will work from there) NOTE: I like notes and
262244
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
266248
</listitem>
267249
<listitem>
268250
<para>Third, register at the <ulink
269-
url="http://forum.springsource.org">
251+
url="http://forum.springframework.org">
270252
SpringSource community forum</ulink>, and if you want to kick
271253
ideas around or float a concept, feel free to start a thread in our <ulink
272-
url="http://forum.springsource.org/forumdisplay.php?f=45">Spring Python
254+
url="http://forum.springframework.org/forumdisplay.php?f=45">Spring Python
273255
forum</ulink>.</para>
274256
</listitem>
275257
<listitem>

‎generate_site.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export M2_HOME=~/apache-maven
2626
export M2=$M2_HOME/bin
2727
export PATH=$M2:$JAVA_HOME/bin:$PATH
2828

29-
cd ~/spring-python-1.2.x
30-
git pull
29+
cd ~/springpython-1.1.x
30+
svn update
3131
./build.py --clean --docs-all --pydoc
3232

‎samples/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
setup.py

‎samples/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
classifiers=["License :: OSI Approved :: GNU General Public License (GPL)",
4242
"License :: OSI Approved :: Apache Software License",
4343
"Intended Audience :: Developers",
44-
"Development Status :: 4 - Beta",
44+
"Development Status :: 5 - Production/Stable",
4545
"Topic :: Software Development :: Libraries :: Python Modules",
4646
"Programming Language :: Python",
4747
"Operating System :: OS Independent"

‎samples/springwiki/noxml.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,33 +47,33 @@ def userDetailsService2(self):
4747

4848
@Object
4949
def plainEncoder(self):
50-
return PlaintextPasswordEncoder()
50+
return PlaintextPasswordEncoder()
5151

5252
@Object
5353
def plainAuthenticationProvider(self):
5454
provider = DaoAuthenticationProvider()
5555
provider.user_details_service = self.userDetailsService2()
5656
provider.password_encoder = self.plainEncoder()
5757
return provider
58-
58+
5959

6060
@Object
6161
def authenticationManager(self):
6262
manager = AuthenticationManager()
6363
manager.auth_providers = [self.plainAuthenticationProvider()]
6464
return manager
65-
65+
6666
@Object
6767
def authenticationProcessingFilter(self):
6868
filter = AuthenticationProcessingFilter()
6969
filter.auth_manager = self.authenticationManager()
7070
filter.alwaysReauthenticate = False
7171
return filter
72-
72+
7373
@Object
7474
def cherrypySessionStrategy(self):
7575
return CP3SessionStrategy()
76-
76+
7777
@Object
7878
def redirectStrategy(self):
7979
return CP3RedirectStrategy()
@@ -89,20 +89,20 @@ def authenticationProcessingFilterEntryPoint(self):
8989
filter_point = AuthenticationProcessingFilterEntryPoint()
9090
filter_point.loginFormUrl = "/login"
9191
filter_point.redirectStrategy = self.redirectStrategy()
92-
return filter_point
92+
return filter_point
9393
@Object
9494
def accessDeniedHandler(self):
9595
handler = SimpleAccessDeniedHandler()
9696
handler.errorPage = "/accessDenied"
9797
handler.redirectStrategy = self.redirectStrategy()
98-
return handler
98+
return handler
9999

100100
@Object
101101
def exceptionTranslationFilter(self):
102102
filter = ExceptionTranslationFilter()
103103
filter.authenticationEntryPoint = self.authenticationProcessingFilterEntryPoint()
104104
filter.accessDeniedHandler = self.accessDeniedHandler()
105-
return filter
105+
return filter
106106

107107
@Object
108108
def filterSecurityInterceptor(self):
@@ -112,13 +112,13 @@ def filterSecurityInterceptor(self):
112112
interceptor.access_decision_mgr = self.accessDecisionManager()
113113
interceptor.sessionStrategy = self.cherrypySessionStrategy()
114114
interceptor.obj_def_source = [("/.*", ["VET_ANY", "CUSTOMER_ANY"])]
115-
return interceptor
115+
return interceptor
116116

117117
@Object
118118
def vetRoleVoter(self):
119119
voter = RoleVoter()
120120
voter.role_prefix = "VET"
121-
return voter
121+
return voter
122122

123123
@Object
124124
def customerRoleVoter(self):
@@ -131,7 +131,7 @@ def accessDecisionManager(self):
131131
policy = AffirmativeBased()
132132
policy.allow_if_all_abstain = False
133133
policy.access_decision_voters = [self.vetRoleVoter(), self.customerRoleVoter()]
134-
return policy
134+
return policy
135135

136136
@Object
137137
def filterChainProxy(self):
@@ -145,7 +145,7 @@ def filterChainProxy(self):
145145
"authenticationProcessingFilter",
146146
"filterSecurityInterceptor"]
147147
)]
148-
return proxy
148+
return proxy
149149

150150
@Object
151151
def loginForm(self):
@@ -155,5 +155,5 @@ def loginForm(self):
155155
form.authenticationManager = self.authenticationManager()
156156
form.redirectStrategy = self.redirectStrategy()
157157
form.httpContextFilter = self.httpContextFilter()
158-
return form
158+
return form
159159

‎springpython.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ release.type=snapshot
99

1010
# This property is only un-commented and set for official tagged releases.
1111
#release.type=release
12-
#build.stamp=RC2
12+
#build.stamp=FINAL
1313

1414
# This property is uncommented for milestone releases.
1515
#release.type=milestone
16-
#build.stamp=M1
16+
#build.stamp=RC1
1717

1818
# docbook reference documentation
1919
doc.ref.dir=docs/reference

‎src/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
setup.py

‎src/build.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@
1212
distributed under the License is distributed on an "AS IS" BASIS,
1313
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
15-
limitations under the License.
15+
limitations under the License.
1616
"""
1717
import re
1818
import sys
19-
from distutils.core import setup
19+
20+
try:
21+
from distribute.core import setup
22+
except ImportError:
23+
from setuptools import setup
2024

2125
if sys.version_info < (2, 4):
2226
print "Spring Python only supports Python 2.4 and higher"
@@ -32,17 +36,17 @@
3236
platforms = ["Python >= 2.4"],
3337
license='Apache Software License (http://www.apache.org/licenses/LICENSE-2.0)',
3438
scripts=['plugins/coily'],
35-
packages=['springpython',
39+
packages=['springpython',
3640
'springpython.aop',
37-
'springpython.jms',
41+
'springpython.jms',
3842
'springpython.config',
3943
'springpython.container',
4044
'springpython.context',
41-
'springpython.database',
42-
'springpython.factory',
43-
'springpython.remoting',
44-
'springpython.remoting.hessian',
45-
'springpython.remoting.pyro',
45+
'springpython.database',
46+
'springpython.factory',
47+
'springpython.remoting',
48+
'springpython.remoting.hessian',
49+
'springpython.remoting.pyro',
4650
'springpython.security',
4751
'springpython.security.context',
4852
'springpython.security.providers',
@@ -52,11 +56,11 @@
5256
download_url="${download_url}",
5357
classifiers=["License :: OSI Approved :: Apache Software License",
5458
"Intended Audience :: Developers",
55-
"Development Status :: 4 - Beta",
59+
"Development Status :: 5 - Production/Stable",
5660
"Topic :: Software Development :: Libraries :: Python Modules",
5761
"Programming Language :: Python",
5862
"Operating System :: OS Independent"
5963
]
60-
64+
6165
)
6266

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
conf = {'/': {"tools.staticdir.root": os.getcwd(),
4747
"tools.sessions.on": True,
48-
"tools.filterChainProxy.on": True},
48+
"tools.securityFilterChain.on": True},
4949
"/images": {"tools.staticdir.on": True,
5050
"tools.staticdir.dir": "images"}
5151
}

0 commit comments

Comments
 (0)