Repository: cxf-fediz Updated Branches: refs/heads/master 9a8fcccb1 -> d87c3c0ca
Supporting code and implicit flows on a single path Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d87c3c0c Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d87c3c0c Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d87c3c0c Branch: refs/heads/master Commit: d87c3c0ca346fe1255dcb2933acd6891724c9b63 Parents: 9a8fccc Author: Sergey Beryozkin <[email protected]> Authored: Mon Feb 8 12:19:15 2016 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Mon Feb 8 12:19:15 2016 +0000 ---------------------------------------------------------------------- .../main/webapp/WEB-INF/applicationContext.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d87c3c0c/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml index 9d26cd3..8f9340f 100644 --- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml +++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml @@ -21,13 +21,16 @@ xmlns:cxf="http://cxf.apache.org/core"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:jaxrs="http://cxf.apache.org/jaxrs"; + xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://cxf.apache.org/jaxrs - http://cxf.apache.org/schemas/jaxrs.xsd";> + http://cxf.apache.org/schemas/jaxrs.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd";> <cxf:bus> <cxf:features> @@ -50,10 +53,19 @@ <property name="skipAuthorizationWithOidcScope" value="true"/> <property name="responseFilter" ref="idTokenFilter"/> </bean> + + <util:list id="oidcServices"> + <ref bean="oidcAuthorizationService"/> + <ref bean="oidcImplicitService"/> + </util:list> + + <bean id="authorizationService" class="org.apache.cxf.rs.security.oauth2.services.AuthorizationService"> + <property name="services" ref="oidcServices"/> + </bean> + <jaxrs:server address="/idp"> <jaxrs:serviceBeans> - <ref bean="oidcAuthorizationService"/> - <ref bean="oidcImplicitService"/> + <ref bean="authorizationService"/> </jaxrs:serviceBeans> <jaxrs:providers> <ref bean="viewProvider"/>
