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

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 30 11:18:09 2014
New Revision: 6005

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6005&view=rev
Log:
Shrink credentials syntax.

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

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=6005&r1=6004&r2=6005&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/credentials.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/credentials.xml Fri May 30 11:18:09 2014
@@ -27,22 +27,12 @@
     <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">
-                <property name="resource">
-                    <bean class="org.springframework.core.io.FileSystemResource">
-                        <constructor-arg value="${idp.signing.key}"/>
-                    </bean>
-                </property>
-            </bean>
+            <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">
-                <property name="resource">
-                    <bean class="org.springframework.core.io.FileSystemResource">
-                        <constructor-arg value="${idp.signing.cert}"/>
-                    </bean>
-                </property>
-            </bean>
+            <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+                p:resource="${idp.signing.cert}" />
         </constructor-arg>
     </bean>
 
@@ -50,22 +40,12 @@
     <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">
-                    <property name="resource">
-                        <bean class="org.springframework.core.io.FileSystemResource">
-                            <constructor-arg value="${idp.encryption.key}"/>
-                        </bean>
-                    </property>
-                </bean>
+                <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">
-                    <property name="resource">
-                        <bean class="org.springframework.core.io.FileSystemResource">
-                            <constructor-arg value="${idp.encryption.cert}"/>
-                        </bean>
-                    </property>
-                </bean>
+                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+                    p:resource="${idp.encryption.cert}" />
             </constructor-arg>
         </bean>
 
@@ -76,22 +56,12 @@
         <!--
         <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="resource">
-                        <bean class="org.springframework.core.io.FileSystemResource">
-                            <constructor-arg value="${idp.encryption.key.2}"/>
-                        </bean>
-                    </property>
-                </bean>
+                <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">
-                    <property name="resource">
-                        <bean class="org.springframework.core.io.FileSystemResource">
-                            <constructor-arg value="${idp.encryption.cert.2}"/>
-                        </bean>
-                    </property>
-                </bean>
+                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+                    p:resource="${idp.encryption.cert.2}" />
             </constructor-arg>
         </bean>
         -->

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties

[... 24 lines stripped ...]