dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19511
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-06-24 16:17:03 +0700
message:
  explicitly define authorizationCodeServices bean
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml
  dhis-2/dhis-web/dhis-web-uaa/src/main/resources/META-INF/dhis/webapi-uaa.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml	2015-06-21 04:35:23 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml	2015-06-24 09:17:03 +0000
@@ -78,6 +78,8 @@
 
   <bean id="tokenStore" class="org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore" />
 
+  <bean id="authorizationCodeServices" class="org.springframework.security.oauth2.provider.code.InMemoryAuthorizationCodeServices" />
+
   <bean id="tokenServices" class="org.springframework.security.oauth2.provider.token.DefaultTokenServices">
     <property name="tokenStore" ref="tokenStore" />
     <property name="supportRefreshToken" value="true" />

=== modified file 'dhis-2/dhis-web/dhis-web-uaa/src/main/resources/META-INF/dhis/webapi-uaa.xml'
--- dhis-2/dhis-web/dhis-web-uaa/src/main/resources/META-INF/dhis/webapi-uaa.xml	2015-06-23 04:12:17 +0000
+++ dhis-2/dhis-web/dhis-web-uaa/src/main/resources/META-INF/dhis/webapi-uaa.xml	2015-06-24 09:17:03 +0000
@@ -29,7 +29,7 @@
   <!-- OAuth2 -->
   <oauth:authorization-server client-details-service-ref="clientDetailsService" token-services-ref="tokenServices"
     user-approval-page="forward:/uaa/oauth/confirm_access">
-    <oauth:authorization-code />
+    <oauth:authorization-code authorization-code-services-ref="authorizationCodeServices" />
     <oauth:refresh-token />
     <oauth:password authentication-manager-ref="authenticationManager" />
   </oauth:authorization-server>