[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/global-user.xml idp-profile-spring/src/ma...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 28 10:21:28 2014
New Revision: 5780

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5780&view=rev
Log:
IDP-401 Revert last and for now provide profile defaults to every parser that consumes relying-party.xml

Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java

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=5780&r1=5779&r2=5780&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Mon Apr 28 10:21:28 2014
@@ -81,6 +81,7 @@
 
     <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/property-placeholder.xml</value>
     </util:list>
 

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java?rev=5780&r1=5779&r2=5780&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java Mon Apr 28 10:21:28 2014
@@ -161,8 +161,6 @@
     @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
         super.doParse(element, parserContext, builder);
         
-        builder.setLazyInit(true);
-
         if (element.hasAttributeNS(null, "assertionLifetime")) {
             // Set as a string and let the converter to the work
             builder.addPropertyValue("assertionLifetime", element.getAttributeNS(null, "assertionLifetime"));