[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/attribute-filter.xml conf/attribute-resol...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jun 24 10:35:21 2014
New Revision: 6160

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6160&view=rev
Log:
IDP-422: switch Spring properties over to %{} syntax

Added:
    trunk/idp-conf/src/main/resources/conf/c14n/
    trunk/idp-conf/src/main/resources/conf/c14n/simple-subject-c14n-config.xml   (with props)
    trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml
      - copied, changed from r6155, trunk/idp-conf/src/main/resources/conf/subject-c14n.xml
    trunk/idp-conf/src/main/resources/logs/
Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-filter.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.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/idp.properties
    trunk/idp-conf/src/main/resources/conf/metadata-providers.xml
    trunk/idp-conf/src/main/resources/conf/property-placeholder.xml
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/conf/subject-c14n.xml
    trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.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/services-system.xml
    trunk/idp-conf/src/main/resources/system/conf/session-manager.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/simple-subject-c14n-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/attribute-filter.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-filter.xml?rev=6160&r1=6159&r2=6160&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-filter.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-filter.xml Tue Jun 24 10:35:21 2014
@@ -7,11 +7,13 @@
     and their options.
 -->
 <afp:AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
-                                xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" 
-                                xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
-                                                    urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
-                                                    urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
+        xmlns:afp="urn:mace:shibboleth:2.0:afp"
+        xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" 
+        xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml"

[... 1375 lines stripped ...]