[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn/jaas-authn-config.xml conf/authn/ld...

[noreply at shibboleth.net]

Author: tzeller
Date: Sun Jun 22 02:46:12 2014
New Revision: 6146

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6146&view=rev
Log:
Remove the property-placeholder location attribute.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/credentials.xml
    trunk/idp-conf/src/main/resources/conf/error-mappings.xml
    trunk/idp-conf/src/main/resources/conf/global.xml
    trunk/idp-conf/src/main/resources/conf/property-placeholder.xml
    trunk/idp-conf/src/main/resources/conf/relying-party.xml
    trunk/idp-conf/src/main/resources/conf/saml-nameid.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/profile-defaults.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/subject-c14n-system.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-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/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/artifact-resolution-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml?rev=6146&r1=6145&r2=6146&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml Sun Jun 22 02:46:12 2014
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
        
-    <context:property-placeholder location="file:///${idp.home}/conf/idp.properties" />
+    <context:property-placeholder />
     
     <!-- Specify your JAAS config. -->
     <bean id="JAASConfig" class="org.springframework.core.io.FileSystemResource" c:path="${idp.home}/conf/authn/jaas.config" />

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=6146&r1=6145&r2=6146&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml Sun Jun 22 02:46:12 2014
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
        
-    <context:property-placeholder location="file:///${idp.home}/conf/idp.properties" />
+    <context:property-placeholder />
     
     <!-- Names of form fields to pull username and password from. -->
     <bean id="shibboleth.authn.LDAP.UsernameFieldName" class="java.lang.String" c:_0="username" />

Modified: trunk/idp-conf/src/main/resources/conf/credentials.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/credentials.xml?rev=6146&r1=6145&r2=6146&view=diff
==============================================================================

[... 506 lines stripped ...]