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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jun 17 22:42:42 2014
New Revision: 6099

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6099&view=rev
Log:
Fix subversion stomping on file.

Modified:
    trunk/idp-conf/src/main/resources/conf/relying-party.xml

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=6099&r1=6098&r2=6099&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party.xml Tue Jun 17 22:42:42 2014
@@ -1,81 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    This file is an EXAMPLE configuration file.
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:c="http://www.springframework.org/schema/c"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+                           
+       default-init-method="initialize"
+       default-destroy-method="destroy">
 
-    This file specifies relying party dependent configurations for the IdP, for example, whether SAML assertions to a 
-    particular relying party should be signed.  It also includes metadata provider and credential definitions used 
-    when answering requests to a relying party.
--->
-<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" 
-                      xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:resource="urn:mace:shibboleth:2.0:resource" 
-                      xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:samlsec="urn:mace:shibboleth:2.0:security:saml" 
-                      xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                      xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
-                                          urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
-                                          urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
-                                          urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd 
-                                          urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
-                                          urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
-                                       
-    <!-- ========================================== -->
-    <!--      Relying Party Configurations          -->
-    <!-- ========================================== -->
-    <rp:AnonymousRelyingParty provider="${idp.entity.id}" defaultSigningCredentialRef="IdPCredential"/>
+    <context:property-placeholder location="file:///${idp.home}/conf/idp.properties" />
+
+    <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
+    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     
-    <rp:DefaultRelyingParty provider="${idp.entity.id}" defaultSigningCredentialRef="IdPCredential">
-        <!-- 
-            Each attribute in these profiles configuration is set to its default value,
-            that is, the values that would be in effect if those attributes were not present.
-            We list them here so that people are aware of them (since they seem reluctant to 
-            read the documentation).
-        -->
-        <rp:ProfileConfiguration xsi:type="saml:ShibbolethSSOProfile" includeAttributeStatement="false" 
-                                 assertionLifetime="PT5M" signResponses="always" signAssertions="never"
-                                 includeConditionsNotBefore="true"/>
-                              
-        <rp:ProfileConfiguration xsi:type="saml:SAML1AttributeQueryProfile" assertionLifetime="PT5M" 
-                                 signResponses="conditional" signAssertions="never"
-                                 includeConditionsNotBefore="true"/>
+    <!--

[... 91 lines stripped ...]