Skip to content

Commit 0b485c0

Browse files
author
Dariusz Suchojad
committed
SESPRINGPYTHONPY-126: Merging changes into trunk. Verified HTML docs were generated correctly and all examples use XSD 1.1
git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk@715 ce8fead1-4192-4296-8608-a705134b927f
1 parent d862974 commit 0b485c0

File tree

6 files changed

+42
-42
lines changed

6 files changed

+42
-42
lines changed

‎springpython/docs/reference/src/aop.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ print service.method("something")
5353

5454
<programlisting><![CDATA[
5555
<?xml version="1.0" encoding="UTF-8"?>
56-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
56+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
5757
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
58-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
59-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
58+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
59+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
6060
6161
<object id="service" class="SampleService"/>
6262
@@ -111,10 +111,10 @@ service = factory.getProxy()
111111

112112
<programlisting><![CDATA[
113113
<?xml version="1.0" encoding="UTF-8"?>
114-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
114+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
115115
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
116-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
117-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
116+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
117+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
118118
119119
<object id="targetService" class="SampleService"/>
120120
@@ -180,10 +180,10 @@ print service.method(" proxy factory object")
180180

181181
<programlisting><![CDATA[
182182
<?xml version="1.0" encoding="UTF-8"?>
183-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
183+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
184184
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
185-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
186-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
185+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
186+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
187187
188188
<object id="targetService" class="SampleService"/>
189189

‎springpython/docs/reference/src/dao.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,10 +348,10 @@ dt = DatabaseTemplate(factory)
348348

349349
<programlisting><![CDATA[
350350
<?xml version="1.0" encoding="UTF-8"?>
351-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
351+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
352352
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
353-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
354-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
353+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
354+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
355355
356356
<object id="connection_factory" class="springpython.database.factory.SQLServerConnectionFactory">
357357
<property name="odbc_info">

‎springpython/docs/reference/src/objects.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ service = container.get_object("sampleService")
195195
decorator, objects may be defined with pure python code in a centralized class.</para>
196196

197197
<para>Due to limitations in the format of PyContainer, another <ulink
198-
url="http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
198+
url="http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
199199
schema has been developed</ulink> called <classname>XMLConfig</classname> that more closely models
200200
the original Spring Java version. It has support for
201201
<link linkend="objects-config-xmlconfig-referenced">referenced objects</link> in many more places
@@ -255,10 +255,10 @@ service = container.get_object("sampleService")
255255

256256
<programlisting><![CDATA[
257257
<?xml version="1.0" encoding="UTF-8"?>
258-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
258+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
259259
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
260-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
261-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
260+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
261+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
262262
263263
<object id="MovieLister" class="springpythontest.support.testSupportClasses.MovieLister" scope="prototype">
264264
<property name="finder" ref="MovieFinder"/>

‎springpython/docs/reference/src/remoting.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ print service.get_data("Hello")
6666

6767
<programlisting><![CDATA[
6868
<?xml version="1.0" encoding="UTF-8"?>
69-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
69+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
7070
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
71-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
72-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
71+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
72+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
7373
7474
<object id="service" class="Service"/>
7575
@@ -102,10 +102,10 @@ print service.get_data("Hello")
102102

103103
<programlisting><![CDATA[
104104
<?xml version="1.0" encoding="UTF-8"?>
105-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
105+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
106106
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
107-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
108-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
107+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
108+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
109109
110110
<object id="remoteService" class="Service"/>
111111
@@ -146,11 +146,11 @@ print service.get_data("Hello")
146146
<link linkend="objects-config-xmlconfig-constructors">constructor injection</link>.</para>
147147

148148
<programlisting><![CDATA[
149-
<?xml version="1.0" encoding="UTF-8"?>^M
150-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"^M
151-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"^M
152-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects^M
153-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">^M
149+
<?xml version="1.0" encoding="UTF-8"?>
150+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
151+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
152+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
153+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
154154
155155
<object id="remoteService" class="Service"/>
156156
@@ -255,10 +255,10 @@ service_exporter.after_properties_set()
255255

256256
<programlisting><![CDATA[
257257
<?xml version="1.0" encoding="UTF-8"?>
258-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
258+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
259259
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
260-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
261-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
260+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
261+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
262262
263263
<object id="remoteService" class="server.Service"/>
264264
@@ -301,10 +301,10 @@ if __name__ == "__main__":
301301

302302
<programlisting><![CDATA[
303303
<?xml version="1.0" encoding="UTF-8"?>
304-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
304+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
305305
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
306-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
307-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
306+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
307+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
308308
309309
<object id="service" class="springpython.remoting.pyro.PyroProxyFactory">
310310
<property name="service_url" value="PYROLOC://127.0.0.1:7000/ServiceName"/>
@@ -407,10 +407,10 @@ CLIENT: You got remote data => Hello
407407

408408
<programlisting><![CDATA[
409409
<?xml version="1.0" encoding="UTF-8"?>
410-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
410+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
411411
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
412-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
413-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
412+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
413+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
414414
415415
<object id="personService" class="springpython.remoting.hessian.HessianProxyFactory">
416416
<property name="service_url"><value>http://localhost:8080/</value></property>

‎springpython/docs/reference/src/security.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ class SampleContainer(PythonConfig):
110110

111111
<programlisting><![CDATA[
112112
<?xml version="1.0" encoding="UTF-8"?>
113-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
113+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
114114
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
115-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
116-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
115+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
116+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
117117
118118
<object id="inMemoryUserDetailsService" class="springpython.security.userdetails.InMemoryUserDetailsService">
119119
<property name="user_dict">

‎springpython/docs/reference/src/transaction.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,10 @@ class DatabaseTxTestDecorativeTransactions(PythonConfig):
216216

217217
<programlisting><![CDATA[
218218
<?xml version="1.0" encoding="UTF-8"?>
219-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
219+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
220220
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
221-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
222-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
221+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
222+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
223223
224224
<object id="transactionalObject" class="springpython.database.transaction.AutoTransactionalObject">
225225
<constructor-arg ref="tx_mgr"/>

0 commit comments

Comments
 (0)