[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/conf/authn/x509-internal-authn-config.xml

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 20 18:26:41 2014
New Revision: 6977

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6977&view=rev
Log:
Remove extra property override bean.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/x509-internal-authn-config.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/x509-internal-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/x509-internal-authn-config.xml?rev=6977&r1=6976&r2=6977&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/x509-internal-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/x509-internal-authn-config.xml Thu Nov 20 18:26:41 2014
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
     <!--
     You can define a TrustEngine to apply to any candidate certificates by defining a bean named
     "shibboleth.authn.X509.TrustEngine". You could also define that in conf/global.xml if you need