Skip to content

Commit 4cb6fc2

Browse files
gregturngregturn
committed
IN PROGRESS - issue SESPRINGPYTHONPY-70: Scrub function/attribute naming conventions to more closely follow PEP-0008.
http://jira.springframework.org/browse/SESPRINGPYTHONPY-70 Updated PetClinic to work with scrubbed APIs. git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk/springpython@149 ce8fead1-4192-4296-8608-a705134b927f
1 parent a46ae86 commit 4cb6fc2

8 files changed

Lines changed: 227 additions & 213 deletions

File tree

‎samples/petclinic/cherrypy/applicationContext-client.xml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33

44
<component id="controller" class="springpython.remoting.pyro.PyroProxyFactory">
5-
<property name="serviceUrl">"PYROLOC://localhost:7766/Controller"</property>
5+
<property name="service_url">"PYROLOC://localhost:7766/Controller"</property>
66
</component>
77

88
<component id="view" class="view.PetClinicView">
99
<property name="controller" local="controller"/>
1010
</component>
1111

12-
<component id="userDetailsService" class="springpython.remoting.pyro.PyroProxyFactory">
13-
<property name="serviceUrl">"PYROLOC://localhost:7766/UserDetails"</property>
12+
<component id="user_details_service" class="springpython.remoting.pyro.PyroProxyFactory">
13+
<property name="service_url">"PYROLOC://localhost:7766/UserDetails"</property>
1414
</component>
1515

1616
<component id="userDetailsService2" class="springpython.security.userdetails.InMemoryUserDetailsService">
17-
<property name="userMap">
17+
<property name="user_dict">
1818
{
1919
"jcarter": ("password6", ["VET_ANY"], True),
2020
}
2121
</property>
2222
</component>
2323

2424
<component id="userDetailsService3" class="springpython.security.userdetails.InMemoryUserDetailsService">
25-
<property name="userMap">
25+
<property name="user_dict">
2626
{
2727
"jcoleman": ("password5", ["CUSTOMER_ANY"], True)
2828
}
@@ -46,43 +46,43 @@
4646
<component id="plainEncoder" class="springpython.security.providers.encoding.PlaintextPasswordEncoder"/>
4747

4848
<component id="plainAuthenticationProvider" class="springpython.security.providers.dao.DaoAuthenticationProvider">
49-
<property name="userDetailsService" local="userDetailsService"/>
50-
<property name="passwordEncoder" local="plainEncoder"/>
49+
<property name="user_details_service" local="user_details_service"/>
50+
<property name="password_encoder" local="plainEncoder"/>
5151
</component>
5252

5353
<component id="md5AuthenticationProvider" class="springpython.security.providers.dao.DaoAuthenticationProvider">
54-
<property name="userDetailsService" local="md5UserDetailsService"/>
55-
<property name="passwordEncoder" local="md5Encoder"/>
54+
<property name="user_details_service" local="md5UserDetailsService"/>
55+
<property name="password_encoder" local="md5Encoder"/>
5656
</component>
5757

5858
<component id="shaAuthenticationProvider" class="springpython.security.providers.dao.DaoAuthenticationProvider">
59-
<property name="userDetailsService" local="shaUserDetailsService"/>
60-
<property name="passwordEncoder" local="shaEncoder"/>
59+
<property name="user_details_service" local="shaUserDetailsService"/>
60+
<property name="password_encoder" local="shaEncoder"/>
6161
</component>
6262

6363
<component id="authenticationManager" class="springpython.security.providers.AuthenticationManager">
64-
<property name="authenticationProviderList">
64+
<property name="auth_providers">
6565
<list local="plainAuthenticationProvider"/>
6666
<list local="md5AuthenticationProvider"/>
6767
<list local="shaAuthenticationProvider"/>
6868
</property>
6969
</component>
7070

7171
<component id="vetRoleVoter" class="springpython.security.vote.RoleVoter">
72-
<property name="rolePrefix">"VET"</property>
72+
<property name="role_prefix">"VET"</property>
7373
</component>
7474

7575
<component id="customerRoleVoter" class="springpython.security.vote.RoleVoter">
76-
<property name="rolePrefix">"CUSTOMER"</property>
76+
<property name="role_prefix">"CUSTOMER"</property>
7777
</component>
7878

7979
<component id="ownerVoter" class="controller.OwnerVoter">
8080
<property name="controller" local="controller"/>
8181
</component>
8282

8383
<component id="accessDecisionManager" class="springpython.security.vote.AffirmativeBased">
84-
<property name="allowIfAllAbstainDecisions">False</property>
85-
<property name="accessDecisionVoterList">
84+
<property name="allow_if_all_abstain">False</property>
85+
<property name="access_decision_voters">
8686
<list local="vetRoleVoter"/>
8787
<list local="customerRoleVoter"/>
8888
<list local="ownerVoter"/>
@@ -98,16 +98,16 @@
9898
</component>
9999

100100
<component id="authenticationProcessingFilter" class="springpython.security.web.AuthenticationProcessingFilter">
101-
<property name="authenticationManager" local="authenticationManager"/>
101+
<property name="auth_manager" local="authenticationManager"/>
102102
<property name="alwaysReauthenticate">False</property>
103103
</component>
104104

105105
<component id="filterSecurityInterceptor" class="springpython.security.web.FilterSecurityInterceptor">
106-
<property name="validateConfigAttributes">False</property>
107-
<property name="authenticationManager" local="authenticationManager"/>
108-
<property name="accessDecisionManager" local="accessDecisionManager"/>
106+
<property name="validate_config_attributes">False</property>
107+
<property name="auth_manager" local="authenticationManager"/>
108+
<property name="access_decision_manager" local="accessDecisionManager"/>
109109
<property name="sessionStrategy" local="cherrypySessionStrategy"/>
110-
<property name="objectDefinitionSource">
110+
<property name="obj_def_source">
111111
[
112112
("/vets.*", ["VET_ANY"]),
113113
("/editOwner.*", ["VET_ANY", "OWNER"]),

‎samples/petclinic/cherrypy/applicationContext-server.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
</component>
1010

1111
<component id="remoteController" class="controller.PetClinicController">
12-
<property name="connectionFactory" local="connectionFactory"/>
12+
<property name="connection_factory" local="connectionFactory"/>
1313
</component>
1414

1515
<component id="controllerExporter" class="springpython.remoting.pyro.PyroServiceExporter">
16-
<property name="serviceName">"Controller"</property>
16+
<property name="service_name">"Controller"</property>
1717
<property name="service" local="remoteController"/>
1818
</component>
1919

@@ -22,7 +22,7 @@
2222
</component>
2323

2424
<component id="userDetailsServiceExporter" class="springpython.remoting.pyro.PyroServiceExporter">
25-
<property name="serviceName">"UserDetails"</property>
25+
<property name="service_name">"UserDetails"</property>
2626
<property name="service" local="remoteUserDetailsService"/>
2727
</component>
2828

‎samples/petclinic/cherrypy/applicationContext.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99
</component>
1010

1111
<component id="controller" class="controller.PetClinicController">
12-
<property name="connectionFactory" local="connectionFactory"/>
12+
<property name="connection_factory" local="connectionFactory"/>
1313
</component>
1414

1515
<component id="root" class="view.PetClinicView">
1616
<property name="controller" local="controller"/>
1717
</component>
1818

19-
<component id="userDetailsService" class="springpython.security.userdetails.dao.DatabaseUserDetailsService">
19+
<component id="user_details_service" class="springpython.security.userdetails.dao.DatabaseUserDetailsService">
2020
<property name="dataSource" local="connectionFactory"/>
2121
</component>
2222

2323
<component id="userDetailsService2" class="springpython.security.userdetails.InMemoryUserDetailsService">
24-
<property name="userMap">
24+
<property name="user_dict">
2525
{
2626
"jcarter": ("password6", ["VET_ANY"], True)
2727
}
2828
</property>
2929
</component>
3030

3131
<component id="userDetailsService3" class="springpython.security.userdetails.InMemoryUserDetailsService">
32-
<property name="userMap">
32+
<property name="user_dict">
3333
{
3434
"jcoleman": ("password5", ["CUSTOMER_ANY"], True)
3535
}
@@ -53,43 +53,43 @@
5353
</component>
5454

5555
<component id="plainAuthenticationProvider" class="springpython.security.providers.dao.DaoAuthenticationProvider">
56-
<property name="userDetailsService" local="userDetailsService"/>
57-
<property name="passwordEncoder" local="plainEncoder"/>
56+
<property name="user_details_service" local="user_details_service"/>
57+
<property name="password_encoder" local="plainEncoder"/>
5858
</component>
5959

6060
<component id="md5AuthenticationProvider" class="springpython.security.providers.dao.DaoAuthenticationProvider">
61-
<property name="userDetailsService" local="md5UserDetailsService"/>
62-
<property name="passwordEncoder" local="md5Encoder"/>
61+
<property name="user_details_service" local="md5UserDetailsService"/>
62+
<property name="password_encoder" local="md5Encoder"/>
6363
</component>
6464

6565
<component id="shaAuthenticationProvider" class="springpython.security.providers.dao.DaoAuthenticationProvider">
66-
<property name="userDetailsService" local="shaUserDetailsService"/>
67-
<property name="passwordEncoder" local="shaEncoder"/>
66+
<property name="user_details_service" local="shaUserDetailsService"/>
67+
<property name="password_encoder" local="shaEncoder"/>
6868
</component>
6969

7070
<component id="authenticationManager" class="springpython.security.providers.AuthenticationManager">
71-
<property name="authenticationProviderList">
71+
<property name="auth_providers">
7272
<list local="plainAuthenticationProvider"/>
7373
<list local="md5AuthenticationProvider"/>
7474
<list local="shaAuthenticationProvider"/>
7575
</property>
7676
</component>
7777

7878
<component id="vetRoleVoter" class="springpython.security.vote.RoleVoter">
79-
<property name="rolePrefix">"VET"</property>
79+
<property name="role_prefix">"VET"</property>
8080
</component>
8181

8282
<component id="customerRoleVoter" class="springpython.security.vote.RoleVoter">
83-
<property name="rolePrefix">"CUSTOMER"</property>
83+
<property name="role_prefix">"CUSTOMER"</property>
8484
</component>
8585

8686
<component id="ownerVoter" class="controller.OwnerVoter">
8787
<property name="controller" local="controller"/>
8888
</component>
8989

9090
<component id="accessDecisionManager" class="springpython.security.vote.AffirmativeBased">
91-
<property name="allowIfAllAbstainDecisions">False</property>
92-
<property name="accessDecisionVoterList">
91+
<property name="allow_if_all_abstain">False</property>
92+
<property name="access_decision_voters">
9393
<list local="vetRoleVoter"/>
9494
<list local="customerRoleVoter"/>
9595
<list local="ownerVoter"/>
@@ -105,16 +105,16 @@
105105
</component>
106106

107107
<component id="authenticationProcessingFilter" class="springpython.security.web.AuthenticationProcessingFilter">
108-
<property name="authenticationManager" local="authenticationManager"/>
108+
<property name="auth_manager" local="authenticationManager"/>
109109
<property name="alwaysReauthenticate">False</property>
110110
</component>
111111

112112
<component id="filterSecurityInterceptor" class="springpython.security.web.FilterSecurityInterceptor">
113-
<property name="validateConfigAttributes">False</property>
114-
<property name="authenticationManager" local="authenticationManager"/>
115-
<property name="accessDecisionManager" local="accessDecisionManager"/>
113+
<property name="validate_config_attributes">False</property>
114+
<property name="auth_manager" local="authenticationManager"/>
115+
<property name="access_decision_manager" local="accessDecisionManager"/>
116116
<property name="sessionStrategy" local="cherrypySessionStrategy"/>
117-
<property name="objectDefinitionSource">
117+
<property name="obj_def_source">
118118
[
119119
("/vets.*", ["VET_ANY"]),
120120
("/editOwner.*", ["VET_ANY", "OWNER"]),

‎samples/petclinic/cherrypy/controller.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ def __init__(self, wrappedUserDetailsService = None, encoder = None):
304304
self.encoder = encoder
305305
self.logger = logging.getLogger("springpython.petclinic.controller.PreencodingUserDetailsService")
306306

307-
def loadUserByUsername(self, username):
308-
user = self.wrappedUserDetailsService.loadUserByUsername(username)
307+
def load_user(self, username):
308+
user = self.wrappedUserDetailsService.load_user(username)
309309
user.password = self.encoder.encodePassword(user.password, None)
310310
self.logger.debug("Pre-converting %s's password to hashed format of %s, before authentication happens." % (username, user.password))
311311
return user

0 commit comments

Comments
 (0)