Skip to content

Commit 93d94c1

Browse files
author
Greg Turnquist
committed
Fixing CRLF
1 parent cbc04f8 commit 93d94c1

8 files changed

+436
-436
lines changed

‎test/springpythontest/support/affirmativeBasedApplicationContext.xml

Lines changed: 50 additions & 50 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>
@@ -61,10 +61,10 @@
6161

6262
<object id="access_decision_mgr" class="springpython.security.vote.AffirmativeBased">
6363
<property name="allow_if_all_abstain"><value>False</value></property>
64-
<property name="access_decision_voters">
65-
<list>
64+
<property name="access_decision_voters">
65+
<list>
6666
<ref object="roleVoter"/>
67-
<ref object="assignedVoter"/>
67+
<ref object="assignedVoter"/>
6868
</list>
6969
</property>
7070
</object>
@@ -73,12 +73,12 @@
7373
<property name="validate_config_attributes"><value>False</value></property>
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>

‎test/springpythontest/support/aopApplicationContext.xml

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
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="wrappingInterceptor" class="springpythontest.support.testSupportClasses.WrappingInterceptor"/>
88

99
<object id="beginEndInterceptor" class="springpythontest.support.testSupportClasses.BeforeAndAfterInterceptor"/>
1010

1111
<object id="pointcutTest1" class="springpython.aop.RegexpMethodPointcutAdvisor">
1212
<property name="advice" ref="wrappingInterceptor"/>
13-
<property name="patterns">
14-
<list>
15-
<value>.*do.*</value>
16-
</list>
17-
</property>
13+
<property name="patterns">
14+
<list>
15+
<value>.*do.*</value>
16+
</list>
17+
</property>
1818
</object>
1919

2020
<object id="pointcutTest2" class="springpython.aop.RegexpMethodPointcutAdvisor">
2121
<property name="advice">
22-
<list>
22+
<list>
2323
<ref object="beginEndInterceptor"/>
24-
<ref object="wrappingInterceptor"/>
24+
<ref object="wrappingInterceptor"/>
25+
</list>
26+
</property>
27+
<property name="patterns">
28+
<list>
29+
<value>.*do.*</value>
2530
</list>
2631
</property>
27-
<property name="patterns">
28-
<list>
29-
<value>.*do.*</value>
30-
</list>
31-
</property>
3232
</object>
3333

3434
<object id="targetService1" class="springpythontest.support.testSupportClasses.SampleService"/>
3535

3636
<object id="sampleService1" class="springpython.aop.ProxyFactoryObject">
3737
<property name="target" ref="targetService1"/>
38-
<property name="interceptors">
38+
<property name="interceptors">
3939
<list>
40-
<ref object="pointcutTest1"/>
40+
<ref object="pointcutTest1"/>
4141
</list>
4242
</property>
4343
</object>
@@ -46,9 +46,9 @@
4646

4747
<object id="sampleService2" class="springpython.aop.ProxyFactoryObject">
4848
<property name="target" ref="targetService2"/>
49-
<property name="interceptors">
49+
<property name="interceptors">
5050
<list>
51-
<ref object="pointcutTest2"/>
51+
<ref object="pointcutTest2"/>
5252
</list>
5353
</property>
5454
</object>
@@ -57,9 +57,9 @@
5757

5858
<object id="factory" class="springpython.aop.ProxyFactory">
5959
<property name="target" ref="sampleService3"/>
60-
<property name="interceptors">
60+
<property name="interceptors">
6161
<list>
62-
<ref object="wrappingInterceptor"/>
62+
<ref object="wrappingInterceptor"/>
6363
</list>
6464
</property>
6565
</object>
@@ -68,32 +68,32 @@
6868

6969
<object id="sampleService4" class="springpython.aop.ProxyFactoryObject">
7070
<property name="target" ref="targetService4"/>
71-
<property name="interceptors">
71+
<property name="interceptors">
7272
<list>
73-
<ref object="wrappingInterceptor"/>
73+
<ref object="wrappingInterceptor"/>
7474
</list>
7575
</property>
7676
</object>
7777

7878
<object id="sampleService5" class="springpython.aop.ProxyFactoryObject">
79-
<property name="target">
80-
<value>springpythontest.support.testSupportClasses.SampleService</value>
79+
<property name="target">
80+
<value>springpythontest.support.testSupportClasses.SampleService</value>
8181
</property>
82-
<property name="interceptors">
82+
<property name="interceptors">
8383
<list>
84-
<ref object="wrappingInterceptor"/>
84+
<ref object="wrappingInterceptor"/>
8585
</list>
8686
</property>
8787
</object>
88-
89-
<object id="sampleService6" class="springpython.aop.ProxyFactoryObject">
90-
<property name="target">
91-
<value>springpythontest.support.testSupportClasses.SampleService</value>
92-
</property>
93-
<property name="interceptors">
94-
<!-- Note that it isn't wrapped in a list -->
95-
<ref object="wrappingInterceptor"/>
96-
</property>
97-
</object>
98-
88+
89+
<object id="sampleService6" class="springpython.aop.ProxyFactoryObject">
90+
<property name="target">
91+
<value>springpythontest.support.testSupportClasses.SampleService</value>
92+
</property>
93+
<property name="interceptors">
94+
<!-- Note that it isn't wrapped in a list -->
95+
<ref object="wrappingInterceptor"/>
96+
</property>
97+
</object>
98+
9999
</objects>

0 commit comments

Comments
 (0)