Skip to content

Commit 026cd32

Browse files
author
Greg Turnquist
committed
Merged unicode branch into master.
2 parents 9c384e7 + 3c3f14d commit 026cd32

37 files changed

+1808
-1411
lines changed

‎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/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"

‎springpython.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# Collection of properties involved in managing Spring Python testing and packaging.
22

3-
version=1.2.0
3+
version=1.1.1
44
natural.name=se-springpython-py
55
project.key=EXTPY
66

77
# release, milestone or snapshot. Trunk is always snapshot for CI build
88
release.type=snapshot
99

1010
# This property is only un-commented and set for official tagged releases.
11-
#release.type=release
12-
#build.stamp=RC2
11+
release.type=release
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/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
download_url="${download_url}",
5353
classifiers=["License :: OSI Approved :: Apache Software License",
5454
"Intended Audience :: Developers",
55-
"Development Status :: 4 - Beta",
55+
"Development Status :: 5 - Production/Stable",
5656
"Topic :: Software Development :: Libraries :: Python Modules",
5757
"Programming Language :: Python",
5858
"Operating System :: OS Independent"

0 commit comments

Comments
 (0)