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

[noreply at shibboleth.net]

Author: iay
Date: Fri May 30 08:06:32 2014
New Revision: 6004

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6004&view=rev
Log:
JSE-1: change factory beans to operate on resources, not files

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=6004&r1=6003&r2=6004&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/credentials.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/credentials.xml Fri May 30 08:06:32 2014
@@ -27,12 +27,22 @@
     <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:privateKeyFile="${idp.signing.key}" />
+            <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
+                <property name="resource">
+                    <bean class="org.springframework.core.io.FileSystemResource">
+                        <constructor-arg value="${idp.signing.key}"/>
+                    </bean>
+                </property>
+            </bean>
         </constructor-arg>
         <constructor-arg name="entityCertificate">
-            <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
-                p:certificateFile="${idp.signing.cert}" />
+            <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+                <property name="resource">
+                    <bean class="org.springframework.core.io.FileSystemResource">
+                        <constructor-arg value="${idp.signing.cert}"/>
+                    </bean>
+                </property>
+            </bean>
         </constructor-arg>
     </bean>
 
@@ -40,12 +50,22 @@
     <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:privateKeyFile="${idp.encryption.key}" />
+                <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
+                    <property name="resource">
+                        <bean class="org.springframework.core.io.FileSystemResource">
+                            <constructor-arg value="${idp.encryption.key}"/>
+                        </bean>
+                    </property>
+                </bean>
             </constructor-arg>
             <constructor-arg name="entityCertificate">
-                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
-                    p:certificateFile="${idp.encryption.cert}" />
+                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+                    <property name="resource">
+                        <bean class="org.springframework.core.io.FileSystemResource">
+                            <constructor-arg value="${idp.encryption.cert}"/>
+                        </bean>
+                    </property>
+                </bean>
             </constructor-arg>
         </bean>
 
@@ -56,12 +76,22 @@
         <!--
         <bean class="org.opensaml.security.x509.BasicX509Credential" p:entityId-ref="entityID">
             <constructor-arg name="privateKey">
-                <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"
-                    p:privateKeyFile="${idp.encryption.key.2}" />
+                <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
+                    <property name="resource">
+                        <bean class="org.springframework.core.io.FileSystemResource">
+                            <constructor-arg value="${idp.encryption.key.2}"/>
+                        </bean>
+                    </property>
+                </bean>
             </constructor-arg>
             <constructor-arg name="entityCertificate">
-                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
-                    p:certificateFile="${idp.encryption.cert.2}" />
+                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+                    <property name="resource">
+                        <bean class="org.springframework.core.io.FileSystemResource">
+                            <constructor-arg value="${idp.encryption.cert.2}"/>
+                        </bean>
+                    </property>
+                </bean>
             </constructor-arg>
         </bean>
         -->