[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/cas-protocol.xml system/conf/cas-protocol...

[noreply at shibboleth.net]

Author: serac
Date: Thu May  7 15:06:19 2015
New Revision: 7503

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7503&view=rev
Log:
Allow overriding CAS components in user configuration.

Modified:
    trunk/idp-conf/src/main/resources/conf/cas-protocol.xml
    trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/cas-protocol.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/cas-protocol.xml?rev=7503&r1=7502&r2=7503&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/cas-protocol.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/cas-protocol.xml	Thu May  7 15:06:19 2015
@@ -12,7 +12,8 @@
     <!--
        | The CAS service registry defines verified relying parties by endpoint URI.
        | Each entry is a regular expression defining a logical group of services whose URIs match the expression.
-       | By default this bean is reloaded periodically according to %{idp.home}/conf/services.properties.
+       |
+       | This bean is reloaded periodically according to %{idp.home}/conf/services.properties.
        -->
     <bean id="cas.ReloadingServiceRegistry"
           class="net.shibboleth.idp.cas.service.PatternServiceRegistry">
@@ -31,4 +32,20 @@
             </list>
         </property>
     </bean>
+
+    <!--
+       | Advanced CAS configuration.
+       |
+       | Override default CAS components by creating aliases to custom components where the alias
+       | is the same as the default component bean ID.
+       -->
+    <!--
+    <bean id="cas.CustomTicketService"
+          class="org.example.idp.cas.CustomTicketService" />
+    <alias name="cas.CustomTicketService" alias="cas.TicketService" />
+
+    <bean id="cas.CustomProxyAuthenticator"
+          class="org.example.idp.cas.CustomProxyAuthenticator" />
+    <alias name="cas.CustomProxyAuthenticator" alias="cas.ProxyAuthenticator" />
+    -->
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml?rev=7503&r1=7502&r2=7503&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml	Thu May  7 15:06:19 2015
@@ -10,10 +10,11 @@
 	   default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <import resource="../../conf/cas-protocol.xml" />
+
     <bean id="cas.TicketService" class="net.shibboleth.idp.cas.ticket.SimpleTicketService"
           c:service-ref="%{idp.cas.StorageService:shibboleth.StorageService}" />
 
     <bean id="cas.ProxyAuthenticator" class="net.shibboleth.idp.cas.proxy.HttpClientProxyAuthenticator" />
 
-    <import resource="../../conf/cas-protocol.xml" />
 </beans>