[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/global-beans.xml conf/webflow-config.xml ...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Oct 17 13:05:34 2013
New Revision: 4872

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4872&view=rev
Log:
Remove deprecated property.

Modified:
    trunk/idp-conf/src/main/resources/conf/global-beans.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/global-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-beans.xml?rev=4872&r1=4871&r2=4872&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-beans.xml Thu Oct 17 13:05:34 2013
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <context:property-placeholder system-properties-mode="OVERRIDE" location="classpath:conf/idp.properties" />
+    <context:property-placeholder location="classpath:conf/idp.properties" />
 
     <!-- This bean MUST be called "conversionService" to work properly. -->
     <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">

Modified: trunk/idp-conf/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/webflow-config.xml?rev=4872&r1=4871&r2=4872&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Thu Oct 17 13:05:34 2013
@@ -6,7 +6,7 @@
                            http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-3.2.xsd
                            http://www.springframework.org/schema/webflow-config classpath:/org/springframework/webflow/config/spring-webflow-config-2.3.xsd">
     
-    <context:property-placeholder system-properties-mode="OVERRIDE" location="classpath:conf/idp.properties" />
+    <context:property-placeholder location="classpath:conf/idp.properties" />
     
     <webflow:flow-registry id="flowRegistry" base-path="${idp.home}/flows" flow-builder-services="flowBuilderServices">
     

Modified: trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml?rev=4872&r1=4871&r2=4872&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml Thu Oct 17 13:05:34 2013
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <context:property-placeholder system-properties-mode="OVERRIDE" location="classpath:conf/idp.properties" />
+    <context:property-placeholder location="classpath:conf/idp.properties" />
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 

Modified: trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml?rev=4872&r1=4871&r2=4872&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml Thu Oct 17 13:05:34 2013
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
        
-    <context:property-placeholder system-properties-mode="OVERRIDE" location="classpath:conf/idp.properties" />
+    <context:property-placeholder location="classpath:conf/idp.properties" />
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     

Modified: trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml?rev=4872&r1=4871&r2=4872&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml Thu Oct 17 13:05:34 2013
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
        
-    <context:property-placeholder system-properties-mode="OVERRIDE" location="classpath:conf/idp.properties" />

[... 5 lines stripped ...]