[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/conf/credentials.xml

[noreply at shibboleth.net]

Author: scantor
Date: Wed May 28 20:20:18 2014
New Revision: 5990

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5990&view=rev
Log:
Rewire with new Chaining resolver.

Modified:
    trunk/idp-conf/src/main/resources/conf/credentials.xml

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=5990&r1=5989&r2=5990&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/credentials.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/credentials.xml Wed May 28 20:20:18 2014
@@ -46,62 +46,62 @@
         </constructor-arg>
     </bean>
 
-    <!-- Your IdP's default decryption key, set via property file. -->
-    <bean id="defaultEncryptionCredential" class="org.opensaml.security.x509.BasicX509Credential"
-            p:entityId-ref="entityID">
-        <constructor-arg name="privateKey">
-            <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
-                <property name="privateKeyFile">
-                    <bean class="java.io.File" c:_0="${idp.encryption.key}" />
-                </property>
-            </bean>
-        </constructor-arg>
-        <constructor-arg name="entityCertificate">
-            <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
-                <property name="certificateFile">
-                    <bean class="java.io.File" c:_0="${idp.encryption.cert}" />
-                </property>
-            </bean>
-        </constructor-arg>
-    </bean>
+    <!-- Your IdP's default encryption (really decryption) keys, set via property file. -->
+    <util:list id="defaultEncryptionCredentials">
+        <bean class="org.opensaml.security.x509.BasicX509Credential" p:entityId-ref="entityID">
+            <constructor-arg name="privateKey">
+                <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
+                    <property name="privateKeyFile">
+                        <bean class="java.io.File" c:_0="${idp.encryption.key}" />
+                    </property>
+                </bean>
+            </constructor-arg>
+            <constructor-arg name="entityCertificate">
+                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+                    <property name="certificateFile">
+                        <bean class="java.io.File" c:_0="${idp.encryption.cert}" />
+                    </property>
+                </bean>
+            </constructor-arg>
+        </bean>
 
-    <!-- Your IdP's secondary decryption key, set via property file, usually same as primary. -->
-    <bean id="secondaryEncryptionCredential" class="org.opensaml.security.x509.BasicX509Credential"
-            p:entityId-ref="entityID">
-        <constructor-arg name="privateKey">
-            <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
-                <property name="privateKeyFile">
-                    <bean class="java.io.File" c:_0="${idp.encryption.key.2}" />
-                </property>
-            </bean>
-        </constructor-arg>
-        <constructor-arg name="entityCertificate">
-            <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
-                <property name="certificateFile">
-                    <bean class="java.io.File" c:_0="${idp.encryption.cert.2}" />
-                </property>
-            </bean>
-        </constructor-arg>
-    </bean>
+        <bean class="org.opensaml.security.x509.BasicX509Credential" p:entityId-ref="entityID">
+            <constructor-arg name="privateKey">
+                <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
+                    <property name="privateKeyFile">
+                        <bean class="java.io.File" c:_0="${idp.encryption.key.2}" />
+                    </property>
+                </bean>
+            </constructor-arg>
+            <constructor-arg name="entityCertificate">
+                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+                    <property name="certificateFile">
+                        <bean class="java.io.File" c:_0="${idp.encryption.cert.2}" />
+                    </property>
+                </bean>
+            </constructor-arg>
+        </bean>
+    </util:list>
 
-    <!-- TODO: Waiting on Brent to finalize the right classes here. -->
-    <bean id="defaultKeyEncryptionCredentialResolver" class="org.opensaml.xmlsec.keyinfo.impl.LocalKeyInfoCredentialResolver">
-        <constructor-arg name="localCredentialResolver">
-            <bean class="org.opensaml.xmlsec.keyinfo.impl.CollectionKeyInfoCredentialResolver">
-                <constructor-arg>
-                    <util:list>
-                        <ref bean="defaultEncryptionCredential" />
-                        <ref bean="secondaryEncryptionCredential" />
-                    </util:list>

[... 31 lines stripped ...]