[java-idp-testbed COMMIT] /trunk/src/main/resources/system/conf/testbed-beans.xml

[noreply at shibboleth.net]

Author: iay
Date: Fri May 30 08:06:58 2014
New Revision: 248

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

Modified:
    trunk/src/main/resources/system/conf/testbed-beans.xml

Modified: trunk/src/main/resources/system/conf/testbed-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/testbed-beans.xml?rev=248&r1=247&r2=248&view=diff
==============================================================================
--- trunk/src/main/resources/system/conf/testbed-beans.xml (original)
+++ trunk/src/main/resources/system/conf/testbed-beans.xml Fri May 30 08:06:58 2014
@@ -30,16 +30,16 @@
     </bean>
     
     <bean id="testbed.idp.PrivateKey" class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
-        <property name="privateKeyFile">
-            <bean class="java.io.File">
+        <property name="resource">
+            <bean class="org.springframework.core.io.FileSystemResource">
                 <constructor-arg value="${testbed.home}/creds/idp.key" />
             </bean>
         </property>
     </bean>
     
     <bean id="testbed.idp.X509Certificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
-        <property name="certificateFile">
-            <bean class="java.io.File">
+        <property name="resource">
+            <bean class="org.springframework.core.io.FileSystemResource">
                 <constructor-arg value="${testbed.home}/creds/idp.crt" />
             </bean>
         </property>
@@ -50,16 +50,16 @@
     </bean>
     
     <bean id="testbed.sp.PrivateKey" class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
-        <property name="privateKeyFile">
-            <bean class="java.io.File">
+        <property name="resource">
+            <bean class="org.springframework.core.io.FileSystemResource">
                 <constructor-arg value="${testbed.home}/creds/sp.key" />
             </bean>
         </property>
     </bean>
     
     <bean id="testbed.sp.X509Certificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
-        <property name="certificateFile">
-            <bean class="java.io.File">
+        <property name="resource">
+            <bean class="org.springframework.core.io.FileSystemResource">
                 <constructor-arg value="${testbed.home}/creds/sp.crt" />
             </bean>
         </property>