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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 12 00:27:26 2014
New Revision: 7076

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7076&view=rev
Log:
Add a BasicX509Credential FactoryBean to simplify config.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/BasicX509CredentialFactoryBean.java   (with props)
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/package-info.java   (with props)
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=7076&r1=7075&r2=7076&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/credentials.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/credentials.xml Fri Dec 12 00:27:26 2014
@@ -17,50 +17,33 @@
 
     This defines the signing and encryption key and certificate pairs referenced by your relying-party.xml
     configuration. You don't normally need to touch this, unless you have advanced requirements such as
-    supporting multiple sets of keys for different relying parties.
+    supporting multiple sets of keys for different relying parties, in which case you may want to define
+    all your credentials here for convenience.
     -->
 
     <!-- Your IdP's default signing key, set via property file. -->
-    <bean id="shibboleth.DefaultSigningCredential" class="org.opensaml.security.x509.BasicX509Credential"
-            p:entityId-ref="entityID">
-        <constructor-arg name="privateKey">
-            <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"
-                p:resource="%{idp.signing.key}" />
-        </constructor-arg>
-        <constructor-arg name="entityCertificate">
-            <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
-                p:resource="%{idp.signing.cert}" />
-        </constructor-arg>
-    </bean>
+    <bean id="shibboleth.DefaultSigningCredential"
+        class="net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean"
+        p:privateKeyResource="%{idp.signing.key}"
+        p:certificateResource="%{idp.signing.cert}"
+        p:entityId-ref="entityID" />
 
     <!-- Your IdP's default encryption (really decryption) keys, set via property file. -->
     <util:list id="shibboleth.DefaultEncryptionCredentials">
-        <bean class="org.opensaml.security.x509.BasicX509Credential" p:entityId-ref="entityID">
-            <constructor-arg name="privateKey">
-                <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"
-                    p:resource="%{idp.encryption.key}" />
-            </constructor-arg>
-            <constructor-arg name="entityCertificate">
-                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
-                    p:resource="%{idp.encryption.cert}" />
-            </constructor-arg>
-        </bean>
+        <bean class="net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean"
+            p:privateKeyResource="%{idp.encryption.key}"
+            p:certificateResource="%{idp.encryption.cert}"
+            p:entityId-ref="entityID" />
 
         <!--
         For key rollover, uncomment and point to your original keypair, and use the one above
         to point to your new keypair. Once metadata has propagated, comment this one out again.
         -->
         <!--
-        <bean class="org.opensaml.security.x509.BasicX509Credential" p:entityId-ref="entityID">
-            <constructor-arg name="privateKey">
-                <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"
-                    p:resource="%{idp.encryption.key.2}" />
-            </constructor-arg>
-            <constructor-arg name="entityCertificate">
-                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
-                    p:resource="%{idp.encryption.cert.2}" />
-            </constructor-arg>
-        </bean>
+        <bean class="net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean"
+            p:privateKeyResource="%{idp.encryption.key.2}"
+            p:certificateResource="%{idp.encryption.cert.2}"
+            p:entityId-ref="entityID" />
         -->
     </util:list>