Simplifying realm b configuration
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/2819062d Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/2819062d Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/2819062d Branch: refs/heads/master Commit: 2819062dcf6ea6b65a9b52fe453735011141d1e4 Parents: 5f0dee1 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Nov 4 12:01:26 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Nov 4 12:01:26 2016 +0000 ---------------------------------------------------------------------- .../src/test/resources/realmb/idp-servlet.xml | 102 ++----------------- 1 file changed, 11 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2819062d/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml ---------------------------------------------------------------------- diff --git a/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml b/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml index e557819..d355e97 100644 --- a/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml +++ b/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml @@ -18,103 +18,23 @@ under the License. --> <beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:webflow="http://www.springframework.org/schema/webflow-config"; - xmlns:p="http://www.springframework.org/schema/p"; - xmlns:context="http://www.springframework.org/schema/context"; - xsi:schemaLocation="http://www.springframework.org/schema/beans + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:webflow="http://www.springframework.org/schema/webflow-config"; + xmlns:context="http://www.springframework.org/schema/context"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/webflow-config - http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd";> + http://www.springframework.org/schema/context/spring-context-3.1.xsd";> - <context:property-placeholder location="classpath:realm.properties" /> - - <context:component-scan base-package="org.apache.cxf.fediz.service.idp.beans" /> - - <bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping" - p:flowRegistry-ref="flowRegistry" p:order="2"> - </bean> - - <bean class="org.springframework.webflow.mvc.servlet.FlowHandlerAdapter" - p:flowExecutor-ref="flowExecutor" /> - - <webflow:flow-executor id="flowExecutor" - flow-registry="flowRegistry"> - <webflow:flow-execution-attributes> - <webflow:always-redirect-on-pause - value="false" /> - </webflow:flow-execution-attributes> + <import resource="config/idp-core-servlet.xml" /> - <webflow:flow-execution-listeners> - <webflow:listener ref="securityFlowExecutionListener" /> - </webflow:flow-execution-listeners> - </webflow:flow-executor> - - <bean id="securityFlowExecutionListener" - class="org.springframework.webflow.security.SecurityFlowExecutionListener"> - <property name="accessDecisionManager" ref="accessDecisionManager" /> - </bean> - - <bean id="accessDecisionManager" - class="org.springframework.security.access.vote.AffirmativeBased"> - <property name="decisionVoters"> - <list> - <bean - class="org.springframework.security.access.vote.RoleVoter"> - <property name="rolePrefix" value="ROLE_" /> - </bean> - <bean - class="org.springframework.security.access.vote.AuthenticatedVoter" /> - </list> - </property> - </bean> - - <webflow:flow-registry id="flowRegistry" - flow-builder-services="builder"> - <webflow:flow-location - path="/WEB-INF/flows/federation-validate-request.xml" id="federation" /> - <webflow:flow-location - path="/WEB-INF/flows/federation-validate-request.xml" id="federation/up" /> - <webflow:flow-location path="/WEB-INF/flows/federation-signin-request.xml" - id="signinRequest" /> - <webflow:flow-location path="/WEB-INF/flows/federation-signin-response.xml" - id="signinResponse" /> - - <webflow:flow-location path="/WEB-INF/flows/saml-validate-request.xml" id="saml" /> - <webflow:flow-location path="/WEB-INF/flows/saml-validate-request.xml" id="saml/up" /> - <webflow:flow-location path="/WEB-INF/flows/saml-signin-request.xml" id="signinSAMLRequest" /> - </webflow:flow-registry> - - <webflow:flow-builder-services id="builder" - view-factory-creator="viewFactoryCreator" expression-parser="expressionParser" /> - - <bean id="expressionParser" - class="org.springframework.webflow.expression.WebFlowOgnlExpressionParser" /> - - <bean id="viewFactoryCreator" - class="org.springframework.webflow.mvc.builder.MvcViewFactoryCreator"> - <property name="viewResolvers"> - <list> - <ref local="viewResolver" /> - </list> - </property> - </bean> - - <bean id="viewResolver" - class="org.springframework.web.servlet.view.InternalResourceViewResolver"> - <property name="prefix" value="/WEB-INF/views/" /> - <property name="suffix" value=".jsp" /> - </bean> + <!-- Define some mutable properties for the IdP --> + <context:property-placeholder location="classpath:realm.properties" /> - <bean id="stsClientForRpAction" - class="org.apache.cxf.fediz.service.idp.beans.STSClientAction"> - <property name="wsdlLocation" - value="https://localhost:0/fediz-idp-sts-realmb/${realm.STS_URI}/STSServiceTransport?wsdl"; /> + <bean id="stsClientForRpAction" class="org.apache.cxf.fediz.service.idp.beans.STSClientAction"> + <property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts-realmb/${realm.STS_URI}/STSServiceTransport?wsdl"; /> <property name="wsdlEndpoint" value="Transport_Port" /> - <property name="tokenType" - value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"; /> + <property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"; /> </bean> </beans>
