X Tutup
Skip to content

Commit d1970a9

Browse files
author
Greg Turnquist
committed
Merge branch 'master' of git://git.springsource.org/spring-python/spring-python
Conflicts: .gitignore
2 parents dae0889 + eaabc87 commit d1970a9

File tree

7 files changed

+46
-27
lines changed

7 files changed

+46
-27
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.pyc
22
target/
3+
.DS_Store

‎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.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">
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">
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
Loading

‎docs/reference/src/objects.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ service = container.get_object("sampleService")
188188
format any further. Any new schema developments will be happening with <classname>XMLConfig</classname>
189189
and <classname>YamlConfig</classname>.</para>
190190

191-
<para>In the spirit of <ulink url="http://www.springframework.org/javaconfig">Spring JavaConfig</ulink>
191+
<para>In the spirit of <ulink url="http://www.springsource.org/javaconfig">Spring JavaConfig</ulink>
192192
and <ulink url="http://blog.springsource.com/2006/11/28/a-java-configuration-option-for-spring/">a blog
193193
posting</ulink> by Rod Johnson, another format has been defined. By extending
194194
<classname>PythonConfig</classname> and using the <methodname>@Object</methodname> python
@@ -1719,7 +1719,7 @@ service = container.get_object("MovieLister")
17191719
their feature set.</para>
17201720

17211721
<para>How much of Spring Java will be supported? That is an open question, best discussed on
1722-
<ulink url="http://forum.springframework.org/forumdisplay.php?f=45">Spring Python's community forum</ulink>.
1722+
<ulink url="http://forum.springsource.org/forumdisplay.php?f=45">Spring Python's community forum</ulink>.
17231723
Basically, this is meant to ease current Java developers into Spring Python and/or provide
17241724
a means to split up objects to support porting parts of your application into Python. There
17251725
isn't any current intention of providing full blown support.</para>

‎docs/reference/src/overview.xml‎

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,33 @@
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>
126146

127147
<section id="overview-support-forums">
128148
<title>Forums and Email</title>
129149

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

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

152172
<section id="overview-support-irc">
153173
<title>IRC</title>
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>
174+
<para>Join us on the #springpython IRC channel at <ulink url="http://freenode.net">Freenode</ulink>.</para>
157175
</section>
158176
</section>
159177

160178
<section id="overview-downloads">
161179
<title>Downloads / Source Code</title>
162180

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

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

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

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>
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>
176195

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

180199
<section id="overview-license">
@@ -191,9 +210,8 @@ svn co https://src.springframework.org/svn/se-springpython-py/trunk/springpython
191210

192211
<itemizedlist>
193212
<listitem><para>Project Lead: Greg L. Turnquist</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>
213+
<listitem><para>Project Contributor: Dariusz Suchojad</para></listitem>
214+
<listitem><para>Project Contributor: Sven Wilhelm</para></listitem>
197215
</itemizedlist>
198216

199217
<para>Many others have also contributed through reporting issues, raising questions, and even
@@ -209,11 +227,11 @@ svn co https://src.springframework.org/svn/se-springpython-py/trunk/springpython
209227
granting you any committer rights. You can checkout a copy of the code anonymously,
210228
and then work on your patch. Email your patch to one of the official team members, and we
211229
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>
212233

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>
234+
<para>After a few patches, if things are looking good, we may evaluate giving you committer rights.</para>
217235

218236
<para>Spring Python is a <ulink url="http://en.wikipedia.org/wiki/Test-driven_development">
219237
TDD-based</ulink> project, meaning if you are working on code, be sure to write an automated
@@ -238,7 +256,7 @@ svn co https://src.springframework.org/svn/se-springpython-py/trunk/springpython
238256
</listitem>
239257
<listitem>
240258
<para>Second, I suggest you register for a
241-
<ulink url="http://jira.springframework.org">jira account</ulink>, so you can leave
259+
<ulink url="http://jira.springsource.org">jira account</ulink>, so you can leave
242260
comments, etc. on the ticket. I think that works (I don't manage jira, so if
243261
it doesn't let me know, and we will work from there) NOTE: I like notes and
244262
comments tracking what you have done, or what you think needs to be done. It
@@ -248,10 +266,10 @@ svn co https://src.springframework.org/svn/se-springpython-py/trunk/springpython
248266
</listitem>
249267
<listitem>
250268
<para>Third, register at the <ulink
251-
url="http://forum.springframework.org">
269+
url="http://forum.springsource.org">
252270
SpringSource community forum</ulink>, and if you want to kick
253271
ideas around or float a concept, feel free to start a thread in our <ulink
254-
url="http://forum.springframework.org/forumdisplay.php?f=45">Spring Python
272+
url="http://forum.springsource.org/forumdisplay.php?f=45">Spring Python
255273
forum</ulink>.</para>
256274
</listitem>
257275
<listitem>

‎docs/reference/src/preface.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
have any requests or comments, please post them on the <ulink
1414
url="http://lists.springsource.com/listmanager/listinfo/springpython-users">user mailing list</ulink>
1515
or on the <ulink
16-
url="http://forum.springframework.org/forumdisplay.php?f=45">Spring Python
16+
url="http://forum.springsource.org/forumdisplay.php?f=45">Spring Python
1717
support forums</ulink>.</para>
1818

1919
<note>

‎docs/reference/src/samples.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
web server object.</para>
1414
</listitem>
1515
<listitem>
16-
<para>A <ulink url="https://fisheye.springframework.org/browse/se-springpython-py/trunk/springpython/samples/petclinic/cherrypy/html/petclinic.html">
16+
<para>A <ulink url="https://fisheye.springsource.org/browse/se-springpython-py/trunk/springpython/samples/petclinic/cherrypy/html/petclinic.html">
1717
detailed design document</ulink> (NOTE: find latest version, and click on
1818
<emphasis>raw</emphasis>) is part of the source code. You can read it from here
1919
or by clicking on a hyperlink while running the application.</para>

0 commit comments

Comments
 (0)
X Tutup