[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/c14n/subject-c14n.xml system/conf/subject...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug  4 14:59:20 2014
New Revision: 6397

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6397&view=rev
Log:
Use list syntax explicitly instead of shorthanding it.

Modified:
    trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml
    trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml?rev=6397&r1=6396&r2=6397&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml Mon Aug  4 14:59:20 2014
@@ -80,7 +80,7 @@
 
     <!--
     Under what conditions should direct NameID mapping be allowed? By default, never.
-    Any predicate can be used here; the example is suitable for enumerating a number of SPs to allow.
+    Any condition can be used here; the example is suitable for enumerating a number of SPs to allow.
     -->
     <bean id="shibboleth.NameTransformPredicate" parent="shibboleth.Conditions.RelyingPartyId">
         <constructor-arg>

Modified: trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml?rev=6397&r1=6396&r2=6397&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml Mon Aug  4 14:59:20 2014
@@ -43,19 +43,19 @@
     </bean>
 
     <bean id="c14n/SAML2Persistent" parent="shibboleth.AbstractSAML2C14NFlowBean"
-        p:formats="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" />
+        p:formats="#{ {'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'} }" />
 
     <bean id="c14n/SAML2Transient" parent="shibboleth.AbstractSAML2C14NFlowBean"
-        p:formats="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" />
+        p:formats="#{ {'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'} }" />
     
     <bean id="c14n/SAML2CryptoTransient" parent="shibboleth.AbstractSAML2C14NFlowBean"
-        p:formats="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" />
+        p:formats="#{ {'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'} }" />
 
     <bean id="c14n/SAML1Transient" parent="shibboleth.AbstractSAML1C14NFlowBean"
-        p:formats="urn:mace:shibboleth:1.0:nameIdentifier" /> 
+        p:formats="#{ {'urn:mace:shibboleth:1.0:nameIdentifier'} }" /> 
 
     <bean id="c14n/SAML1CryptoTransient" parent="shibboleth.AbstractSAML1C14NFlowBean" 
-        p:formats="urn:mace:shibboleth:1.0:nameIdentifier" /> 
+        p:formats="#{ {'urn:mace:shibboleth:1.0:nameIdentifier'} }" /> 
 
     <bean id="c14n/SAML2Transform" parent="shibboleth.AbstractSAML2C14NFlowBean"
             p:formats-ref="shibboleth.NameTransformFormats">