[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: authn-flow-descriptors.xml mvc-beans.xml ...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 15 23:06:37 2013
New Revision: 4865

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4865&view=rev
Log:
These appear to share access to the property replacement bean.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml
    trunk/idp-conf/src/main/resources/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/conf/session-manager.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml?rev=4865&r1=4864&r2=4865&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml Tue Oct 15 23:06:37 2013
@@ -8,8 +8,6 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd
                            http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-3.2.xsd
                            http://www.springframework.org/schema/util classpath:/org/springframework/beans/factory/xml/spring-util-3.2.xsd">
-
-    <context:property-placeholder system-properties-mode="OVERRIDE" location="classpath:conf/idp.properties" />
 
     <!--
     This file provisions the IdP with information about the configured login mechanisms available for use.

Modified: trunk/idp-conf/src/main/resources/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/mvc-beans.xml?rev=4865&r1=4864&r2=4865&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/mvc-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/mvc-beans.xml Tue Oct 15 23:06:37 2013
@@ -9,8 +9,6 @@
                            http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-3.2.xsd
                            http://www.springframework.org/schema/util classpath:/org/springframework/beans/factory/xml/spring-util-3.2.xsd">
 
-    <context:property-placeholder system-properties-mode="OVERRIDE" location="classpath:conf/idp.properties" />
-    
     <!-- HandlerMappings: Prefer first the WebFlow one, then the standard Spring MVC default ones.
          Have to enumerate them all explicitly b/c we're overriding the built-in defaults. -->
     

Modified: trunk/idp-conf/src/main/resources/conf/session-manager.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/session-manager.xml?rev=4865&r1=4864&r2=4865&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/session-manager.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/session-manager.xml Tue Oct 15 23:06:37 2013
@@ -11,8 +11,6 @@
 
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <context:property-placeholder system-properties-mode="OVERRIDE" location="classpath:conf/idp.properties" />
 
     <bean id="shibboleth.SessionManager" class="net.shibboleth.idp.session.impl.StorageBackedSessionManager"
             p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:httpServletResponse-ref="shibboleth.HttpServletResponse"