[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn/authn-events-flow.xml system/conf/c...

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 29 22:22:01 2015
New Revision: 7542

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7542&view=rev
Log:
IDP-730 - Add trimming to unhandled properties in system config files

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml
    trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
    trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml
    trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/x509-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml?rev=7542&r1=7541&r2=7542&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml	Fri May 29 22:22:01 2015
@@ -2,6 +2,13 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
       abstract="true">
+
+    <!-- ADVANCED USE ONLY -->
+    
+    <!--
+    You can ignore this file unless you are creating your own custom login subflows that want to
+    report custom events in response to unusual error or warning conditions.
+    -->
 
     <!-- Custom error events to reflect back from user-supplied login subflows. -->
     <!--

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=7542&r1=7541&r2=7542&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	Fri May 29 22:22:01 2015
@@ -13,7 +13,7 @@
     <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}" />
+          c:service-ref="#{'%{idp.cas.StorageService:shibboleth.StorageService}'.trim()}" />
 
     <bean id="cas.ProxyAuthenticator" class="net.shibboleth.idp.cas.proxy.HttpClientProxyAuthenticator" />
 

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=7542&r1=7541&r2=7542&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml	Fri May 29 22:22:01 2015
@@ -35,7 +35,7 @@
 
     <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
             p:cacheSeconds="%{idp.message.cacheSeconds:300}"
-            p:basenames-ref="%{idp.message.resources:shibboleth.MessageSourceResources}"
+            p:basenames-ref="#{'%{idp.message.resources:shibboleth.MessageSourceResources}'.trim()}"
             p:defaultEncoding="UTF-8" />
 
     <import resource="../../conf/global.xml" />
@@ -72,7 +72,7 @@
                 <prop key="file.resource.loader.class">
                     org.apache.velocity.runtime.resource.loader.FileResourceLoader
                 </prop>
-                <prop key="file.resource.loader.path">#{ '%{idp.views:%{idp.home}/views}'.trim() }</prop>
+                <prop key="file.resource.loader.path">#{'%{idp.views:%{idp.home}/views}'.trim()}</prop>
                 <prop key="file.resource.loader.cache">false</prop>
             </props>
         </property>
@@ -191,11 +191,11 @@
         p:keyStrategy-ref="shibboleth.DataSealerKeyStrategy" />
 

[... 335 lines stripped ...]