X Tutup
Skip to content

Commit a326606

Browse files
author
Dariusz Suchojad
committed
Modified XSD 1.1 to recognize 'True' and 'False' values in addition to 'true' and 'false'. Updated those XMLs which weren't XSD compliant.
git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk/springpython@700 ce8fead1-4192-4296-8608-a705134b927f
1 parent 7049b57 commit a326606

File tree

4 files changed

+57
-55
lines changed

4 files changed

+57
-55
lines changed

‎test/springpythontest/support/contextSpringPythonAppContext.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
2+
<objects xmlns="http://www.springframework.org/springpython/schema/objects/1.1"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
5-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects/1.1
5+
http://springpython.webfactional.com/schema/context/spring-python-context-1.1.xsd">
66

77
<object id="MovieLister" class="springpythontest.support.testSupportClasses.MovieLister" scope="prototype" lazy-init="True">
88
<property name="finder" ref="MovieFinder"/>

‎test/springpythontest/support/providerApplicationContext.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<ref object="labelBasedAclVoter"/>
120120
</list>
121121
</property>
122-
<property name="allow_if_all_abstain">False</property>
122+
<property name="allow_if_all_abstain" value="False" />
123123
</object>
124124

125125
<object id="sampleService" class="springpythontest.support.testSecurityClasses.SampleService"/>

‎test/springpythontest/support/unanimousBasedApplicationContext.xml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
5-
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<objects xmlns="http://www.springframework.org/springpython/schema/objects"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://www.springframework.org/springpython/schema/objects
5+
http://springpython.webfactional.com/schema/context/spring-python-context-1.0.xsd">
66

77
<object id="user_details_service" class="springpython.security.userdetails.InMemoryUserDetailsService">
8-
<property name="user_dict">
9-
<dict>
10-
<entry>
11-
<key><value>basicblueuser</value></key>
12-
<tuple>
13-
<value>password1</value>
14-
<list><value>ROLE_BASIC</value><value>ASSIGNED_BLUE</value></list>
15-
<value>True</value>
16-
</tuple>
8+
<property name="user_dict">
9+
<dict>
10+
<entry>
11+
<key><value>basicblueuser</value></key>
12+
<tuple>
13+
<value>password1</value>
14+
<list><value>ROLE_BASIC</value><value>ASSIGNED_BLUE</value></list>
15+
<value>True</value>
16+
</tuple>
1717
</entry>
18-
<entry>
19-
<key><value>basicorangeuser</value></key>
20-
<tuple>
21-
<value>password2</value>
22-
<list><value>ROLE_BASIC</value><value>ASSIGNED_ORANGE</value></list>
23-
<value>True</value>
24-
</tuple>
25-
</entry>
26-
<entry>
27-
<key><value>otherblueuser</value></key>
28-
<tuple>
29-
<value>password3</value>
30-
<list><value>ROLE_OTHER</value><value>ASSIGNED_BLUE</value></list>
31-
<value>True</value>
32-
</tuple>
33-
</entry>
34-
<entry>
35-
<key><value>otherorangeuser</value></key>
36-
<tuple>
37-
<value>password4</value>
38-
<list><value>ROLE_OTHER</value><value>ASSIGNED_ORANGE</value></list>
39-
<value>True</value>
40-
</tuple>
41-
</entry>
42-
</dict>
18+
<entry>
19+
<key><value>basicorangeuser</value></key>
20+
<tuple>
21+
<value>password2</value>
22+
<list><value>ROLE_BASIC</value><value>ASSIGNED_ORANGE</value></list>
23+
<value>True</value>
24+
</tuple>
25+
</entry>
26+
<entry>
27+
<key><value>otherblueuser</value></key>
28+
<tuple>
29+
<value>password3</value>
30+
<list><value>ROLE_OTHER</value><value>ASSIGNED_BLUE</value></list>
31+
<value>True</value>
32+
</tuple>
33+
</entry>
34+
<entry>
35+
<key><value>otherorangeuser</value></key>
36+
<tuple>
37+
<value>password4</value>
38+
<list><value>ROLE_OTHER</value><value>ASSIGNED_ORANGE</value></list>
39+
<value>True</value>
40+
</tuple>
41+
</entry>
42+
</dict>
4343
</property>
4444
</object>
4545

@@ -48,7 +48,7 @@
4848
</object>
4949

5050
<object id="auth_manager" class="springpython.security.providers.AuthenticationManager">
51-
<property name="auth_providers">
51+
<property name="auth_providers">
5252
<list><ref object="auth_provider"/></list>
5353
</property>
5454
</object>
@@ -60,25 +60,25 @@
6060
</object>
6161

6262
<object id="access_decision_mgr" class="springpython.security.vote.UnanimousBased">
63-
<property name="allow_if_all_abstain">False</property>
64-
<property name="access_decision_voters">
63+
<property name="allow_if_all_abstain" value="False" />
64+
<property name="access_decision_voters">
6565
<list>
6666
<ref object="roleVoter"/>
67-
<ref object="assignedVoter"/>
67+
<ref object="assignedVoter"/>
6868
</list>
6969
</property>
7070
</object>
7171

7272
<object id="securityInterceptor" class="springpython.security.intercept.MethodSecurityInterceptor">
73-
<property name="validate_config_attributes">False</property>
73+
<property name="validate_config_attributes" value="False" />
7474
<property name="auth_manager" ref="auth_manager"/>
7575
<property name="access_decision_mgr" ref="access_decision_mgr"/>
76-
<property name="obj_def_source">
77-
<list>
78-
<tuple>
79-
<value>springpythontest.support.testSecurityClasses.SampleService.do.*</value>
80-
<list><value>ROLE_BASIC</value><value>ASSIGNED_BLUE</value></list>
81-
</tuple>
76+
<property name="obj_def_source">
77+
<list>
78+
<tuple>
79+
<value>springpythontest.support.testSecurityClasses.SampleService.do.*</value>
80+
<list><value>ROLE_BASIC</value><value>ASSIGNED_BLUE</value></list>
81+
</tuple>
8282
</list>
8383
</property>
8484
</object>
@@ -87,7 +87,7 @@
8787

8888
<object id="sampleService" class="springpython.aop.ProxyFactoryObject">
8989
<property name="target" ref="targetService"/>
90-
<property name="interceptors">
90+
<property name="interceptors">
9191
<list><ref object="securityInterceptor"/></list>
9292
</property>
9393
</object>

‎xml/schema/context/spring-python-context-1.1.xsd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,8 @@
543543
<xsd:enumeration value="default"/>
544544
<xsd:enumeration value="true"/>
545545
<xsd:enumeration value="false"/>
546+
<xsd:enumeration value="True"/>
547+
<xsd:enumeration value="False"/>
546548
</xsd:restriction>
547549
</xsd:simpleType>
548550

0 commit comments

Comments
 (0)
X Tutup