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

[noreply at shibboleth.net]

Author: scantor
Date: Thu May 29 11:02:04 2014
New Revision: 5995

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5995&view=rev
Log:
Improving some filenames and config layout.

Added:
    trunk/idp-conf/src/main/resources/conf/global.xml
      - copied, changed from r5991, trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/services.xml
      - copied, changed from r5994, trunk/idp-conf/src/main/resources/conf/services-user.xml
    trunk/idp-conf/src/main/resources/conf/subject-c14n.xml
      - copied, changed from r5991, trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml   (with props)
    trunk/idp-conf/src/main/resources/system/conf/security-config.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/credentials.xml
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
    trunk/idp-conf/src/main/resources/conf/services-user.xml
    trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml
    trunk/idp-war/src/main/webapp/WEB-INF/web.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=5995&r1=5994&r2=5995&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/credentials.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/credentials.xml Thu May 29 11:02:04 2014
@@ -20,48 +20,32 @@
     <!--
     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 rleying parties.
-    
-    Key rollover is generally only an issue for your encryption/decryption keypair, and we define two beans
-    here that by default point to the same keypair. You can change your properties file to split off one
-    of the keypairs if you need to support two at once while you wait for metadata to propagate.
+    supporting multiple sets of keys for different relying parties.
     -->
 
     <!-- Your IdP's default signing key, set via property file. -->
-    <bean id="defaultSigningCredential" class="org.opensaml.security.x509.BasicX509Credential"
+    <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="privateKeyFile">
-                    <bean class="java.io.File" c:_0="${idp.signing.key}" />
-                </property>
-            </bean>
+            <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"
+                p:privateKeyFile="${idp.signing.key}" />
         </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.signing.cert}" />
-                </property>
-            </bean>
+            <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+                p:certificateFile="${idp.signing.cert}" />
         </constructor-arg>
     </bean>
 
     <!-- Your IdP's default encryption (really decryption) keys, set via property file. -->
-    <util:list id="defaultEncryptionCredentials">
+    <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="privateKeyFile">
-                        <bean class="java.io.File" c:_0="${idp.encryption.key}" />
-                    </property>
-                </bean>
+                <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"
+                    p:privateKeyFile="${idp.encryption.key}" />
             </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>
+                <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+                    p:certificateFile="${idp.encryption.cert}" />
             </constructor-arg>
         </bean>
 
@@ -72,56 +56,15 @@
         <!--

[... 230 lines stripped ...]