[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: global-user.xml metadata-providers.xml re...

[noreply at shibboleth.net]

Author: rdw
Date: Fri May  2 09:10:30 2014
New Revision: 5831

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5831&view=rev
Log:
IDP-391  Move the default configuration to have separate files for relying-party configuration and metadata.

Added:
    trunk/idp-conf/src/main/resources/conf/metadata-providers.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/relying-party.xml

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=5831&r1=5830&r2=5831&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Fri May  2 09:10:30 2014
@@ -80,8 +80,7 @@
     <!--  The (currently single) file which provides relying party configuration -->
 
     <util:list id="shibboleth.MetadataResolverResources">
-        <value>file://${idp.home}/conf/relying-party.xml</value>
-        <value>file://${idp.home}/conf/profile-defaults.xml</value>
+        <value>file://${idp.home}/conf/metadata-providers.xml</value>
         <value>file://${idp.home}/conf/property-placeholder.xml</value>
     </util:list>
 

Modified: trunk/idp-conf/src/main/resources/conf/relying-party.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party.xml?rev=5831&r1=5830&r2=5831&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party.xml Fri May  2 09:10:30 2014
@@ -68,41 +68,6 @@
         
     </rp:DefaultRelyingParty>
         
-    
-    <!-- ========================================== -->
-    <!--      Metadata Configuration                -->
-    <!-- ========================================== -->
-    <!-- MetadataProvider the combining other MetadataProviders -->
-    <metadata:MetadataProvider id="ShibbolethMetadata" xsi:type="metadata:ChainingMetadataProvider">
-    
-     
-        <!-- Example metadata provider. -->
-        <!-- Reads metadata from a URL and store a backup copy on the file system. -->
-        <!-- Validates the signature of the metadata and filters out all by SP entities in order to save memory -->
-        <metadata:MetadataProvider id="URLMD" xsi:type="metadata:FilesystemMetadataProvider"
-                          metadataFile="${idp.home}/metadata/example-metadata.xml">
-            <metadata:MetadataFilter xsi:type="metadata:ChainingFilter">
-                <metadata:MetadataFilter xsi:type="metadata:SignatureValidation"
-                                requireSignedMetadata="false"> <!--  TODO -->
-                                <metadata:PublicKey>-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
-uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
-LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
-NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
-nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
-E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
-4wIDAQAB
------END PUBLIC KEY-----</metadata:PublicKey>
-                </metadata:MetadataFilter>
-	            <metadata:MetadataFilter xsi:type="metadata:EntityRoleWhiteList">
-                    <metadata:RetainedRole>samlmd:SPSSODescriptor</metadata:RetainedRole>
-                </metadata:MetadataFilter>
-            </metadata:MetadataFilter>
-        </metadata:MetadataProvider>
-        
-    </metadata:MetadataProvider>
-
-    
     <!-- ========================================== -->
     <!--     Security Configurations                -->
     <!-- ========================================== -->