[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/global.xml idp-profile-spring/src/test/re...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Dec 11 17:26:01 2014
New Revision: 7070

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7070&view=rev
Log:
Correct erroneous notion that Spring parses p-namespace values into Lists.  Just use standard Spring <list> syntax.

Modified:
    trunk/idp-conf/src/main/resources/conf/global.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/global.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global.xml?rev=7070&r1=7069&r2=7070&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global.xml Thu Dec 11 17:26:01 2014
@@ -19,10 +19,17 @@
             p:includeOpenSAMLGlobalConfig="true">
         <property name="signatureValidationConfigurations">
             <util:list>
-                <!-- Algorithm URI's may be supplied below as a space-separated list -->
-                <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration" 
-                    p:whitelistedAlgorithms=""
-                    p:blacklistedAlgorithms="" >
+                <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration">
+                    <property name="whitelistedAlgorithms">
+                        <list>
+                            <!-- Supply algorithm URIs as a sequence of <value> elements. -->
+                        </list>
+                    </property>
+                    <property name="blacklistedAlgorithms">
+                        <list>
+                            <!-- Supply algorithm URIs as a sequence of <value> elements. -->
+                        </list>
+                    </property>
                 </bean>
             </util:list>
         </property>

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml?rev=7070&r1=7069&r2=7070&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml Thu Dec 11 17:26:01 2014
@@ -129,9 +129,18 @@
             p:includeOpenSAMLGlobalConfig="true">
         <property name="signatureValidationConfigurations">
             <util:list>
-                <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration" 
-                    p:whitelistedAlgorithms=""
-                    p:blacklistedAlgorithms="foo bar baz">
+                <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration">
+                    <property name="whitelistedAlgorithms">
+                        <list>
+                        </list>
+                    </property>
+                    <property name="blacklistedAlgorithms">
+                        <list>
+                            <value>foo</value>
+                            <value>bar</value>
+                            <value>baz</value>
+                        </list>
+                    </property>
                 </bean>
             </util:list>
         </property>

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml?rev=7070&r1=7069&r2=7070&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml Thu Dec 11 17:26:01 2014
@@ -53,9 +53,18 @@
             p:includeOpenSAMLGlobalConfig="true">
         <property name="signatureValidationConfigurations">
             <util:list>
-                <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration" 
-                    p:whitelistedAlgorithms=""
-                    p:blacklistedAlgorithms="foo bar baz">
+                <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration">
+                    <property name="whitelistedAlgorithms">
+                        <list>
+                        </list>
+                    </property>
+                    <property name="blacklistedAlgorithms">

[... 10 lines stripped ...]