[java-identity-provider COMMIT] in /trunk: idp-cas-impl/src/test/resources/spring/test-flow-beans.xml idp-conf/src/ma...

[noreply at shibboleth.net]

Author: serac
Date: Fri Aug 26 09:46:10 2016
New Revision: 8356

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8356&view=rev
Log:
IDP-1018 Component wiring that actually works w/r/t upgrades.

https://issues.shibboleth.net/jira/browse/IDP-1018
Use the "Default" component naming scheme used throughout the project
and switch to "shibboleth" component namespace prefix for components
that are intended to be configurable and thus in scope for not breaking
on upgrades.

Modified:
    trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
    trunk/idp-conf/src/main/resources/conf/cas-protocol.xml
    trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowInitialAuthnTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyValidateFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ValidateFlowTest.java
    trunk/idp-conf/src/test/resources/test/test-cas-beans.xml
    trunk/idp-conf/src/test/resources/test/test-cas-error-beans.xml

Modified: trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml?rev=8356&r1=8355&r2=8356&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml	(original)
+++ trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml	Fri Aug 26 09:46:10 2016
@@ -58,11 +58,11 @@
           p:secondaryServiceIndex="false"
           p:IDGenerator-ref="shibboleth.SessionIDGenerator" />
 
-    <bean id="cas.TicketService"
+    <bean id="shibboleth.CASTicketService"
           class="net.shibboleth.idp.cas.ticket.impl.SimpleTicketService"
           c:service-ref="shibboleth.StorageService" />
 
-    <bean id="cas.ServiceRegistry"
+    <bean id="shibboleth.CASServiceRegistry"
           class="net.shibboleth.idp.cas.service.PatternServiceRegistry">
         <property name="definitions">
             <list>
@@ -78,18 +78,18 @@
         </property>
     </bean>
 
-    <bean id="cas.ProxyAuthenticator"
+    <bean id="shibboleth.DefaultCASProxyAuthenticator"
           class="net.shibboleth.idp.cas.proxy.impl.HttpClientProxyAuthenticator" />
 
 
     <!-- Flow beans -->
     <bean id="buildProxyChainAction"
           class="net.shibboleth.idp.cas.flow.impl.BuildProxyChainAction"
-          c:ticketService-ref="cas.TicketService" />
+          c:ticketService-ref="shibboleth.CASTicketService" />
 
     <bean id="buildRelyingPartyContextAction"
           class="net.shibboleth.idp.cas.flow.impl.BuildRelyingPartyContextAction"
-          c:registry-ref="cas.ServiceRegistry"/>
+          c:registry-ref="shibboleth.CASServiceRegistry"/>
 
     <bean id="buildSAMLMetadataContextAction"
           class="net.shibboleth.idp.cas.flow.impl.BuildSAMLMetadataContextAction" />
@@ -99,11 +99,11 @@
 
     <bean id="grantProxyTicketAction"
           class="net.shibboleth.idp.cas.flow.impl.GrantProxyTicketAction"
-          c:ticketService-ref="cas.TicketService" />
+          c:ticketService-ref="shibboleth.CASTicketService" />
 
     <bean id="grantServiceTicketAction"
           class="net.shibboleth.idp.cas.flow.impl.GrantServiceTicketAction"
-          c:ticketService-ref="cas.TicketService" />
+          c:ticketService-ref="shibboleth.CASTicketService" />
 
     <bean id="validateIdPSessionAction"
           class="net.shibboleth.idp.cas.flow.impl.ValidateIdpSessionAction"
@@ -111,13 +111,13 @@
 
     <bean id="validateProxyCallbackAction"
           class="net.shibboleth.idp.cas.flow.impl.ValidateProxyCallbackAction"
-          c:proxyAuthenticator-ref="cas.ProxyAuthenticator"
-          c:ticketService-ref="cas.TicketService" />
+          c:proxyAuthenticator-ref="shibboleth.DefaultCASProxyAuthenticator"
+          c:ticketService-ref="shibboleth.CASTicketService" />
 
     <bean id="validateRenewAction"
           class="net.shibboleth.idp.cas.flow.impl.ValidateRenewAction" />
 
     <bean id="validateTicketAction"
           class="net.shibboleth.idp.cas.flow.impl.ValidateTicketAction"
-          c:ticketService-ref="cas.TicketService" />
+          c:ticketService-ref="shibboleth.CASTicketService" />
 </beans>


[... 269 lines stripped ...]