[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingp...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Aug  4 09:38:49 2014
New Revision: 6382

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6382&view=rev
Log:
IDP-442 Fix the creation of the relyingparty selector.  Better logging.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java?rev=6382&r1=6381&r2=6382&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java Mon Aug  4 09:38:49 2014
@@ -17,6 +17,8 @@
 
 package net.shibboleth.idp.profile.spring.relyingparty;
 
+import java.util.List;
+
 import javax.xml.namespace.QName;
 
 import net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate;
@@ -24,6 +26,7 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
@@ -53,7 +56,9 @@
 
         final BeanDefinitionBuilder rpPredicate =
                 BeanDefinitionBuilder.genericBeanDefinition(RelyingPartyIdPredicate.class);
-        rpPredicate.addConstructorArgValue(id);
+        List<String> ids = new ManagedList<>(1);
+        ids.add(id);
+        rpPredicate.addConstructorArgValue(ids);
 
         final BeanDefinitionBuilder egPredicate =
                 BeanDefinitionBuilder.genericBeanDefinition(EntitiesDescriptorPredicate.class);

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=6382&r1=6381&r2=6382&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 Aug  4 09:38:49 2014
@@ -47,7 +47,7 @@
  * and for elements which inherit from <code>saml:SAMLProfileConfigutationType</code>.
  */
 public abstract class BaseSAMLProfileConfigurationParser extends AbstractSingleBeanDefinitionParser {
-    
+
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(BaseSAMLProfileConfigurationParser.class);
 
@@ -178,13 +178,13 @@
                 return;
             }
             credentialRef = relyingParty.getAttributeNS(null, "defaultSigningCredentialRef");
-            log.debug("Using default signing credential reference {}", credentialRef);
+            log.debug("Using default signing credential reference '{}'", credentialRef);
         }
 
         final BeanDefinitionBuilder signingConfiguration =
                 BeanDefinitionBuilder.genericBeanDefinition(BasicSignatureSigningConfiguration.class);
         signingConfiguration.addPropertyReference("signingCredentials", credentialRef);
-        
+
         final BeanDefinitionBuilder configuration =
                 BeanDefinitionBuilder.genericBeanDefinition(SecurityConfiguration.class);
         configuration.addPropertyValue("signatureSigningConfiguration", signingConfiguration.getBeanDefinition());
@@ -197,6 +197,8 @@
     @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
         super.doParse(element, parserContext, builder);
 
+        log.debug("Parsing Legacy SAML profile.  Destination type: '{}'", builder.getBeanDefinition()
+                .getBeanClass().getName());
         setSecurityConfiguration(element, builder, parserContext);
 
         if (element.hasAttributeNS(null, "assertionLifetime")) {
@@ -241,8 +243,7 @@
                     predicateForSigning(element.getAttributeNS(null, "signAssertions")));
         }
         if (element.hasAttributeNS(null, "signRequests")) {
-            builder.addPropertyValue("signRequests",
-                    predicateForSigning(element.getAttributeNS(null, "signRequests")));

[... 5 lines stripped ...]