[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: Sun Feb 22 10:00:49 2015
New Revision: 7361

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7361&view=rev
Log:
IDP-620 TrustEngineRef takes a ref attribute, not text content

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/AbstractChainingParser.java
      - copied, changed from r7360, trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java

Copied: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/AbstractChainingParser.java (from r7360, trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/AbstractChainingParser.java?p2=trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/AbstractChainingParser.java&p1=trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java&r1=7360&r2=7361&rev=7361&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/AbstractChainingParser.java Sun Feb 22 10:00:49 2015
@@ -19,8 +19,6 @@
 
 import java.util.List;
 
-import javax.xml.namespace.QName;
-
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.profile.spring.relyingparty.security.SecurityNamespaceHandler;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -34,21 +32,10 @@
 import org.w3c.dom.Element;
 
 /**
- * Parser for trust engines of type SignatureChaining.
+ * Base Parser for trust engines of type SignatureChaining and Chaining.
  */
-public class SignatureChainingParser extends AbstractTrustEngineParser {
+public class AbstractChainingParser extends AbstractTrustEngineParser {
     
-    /** Schema type. */
-    public static final QName TYPE_NAME = new QName(SecurityNamespaceHandler.NAMESPACE, "SignatureChaining");
-
-    /** TrustEngineRef element name. */
-    public static final QName TRUST_ENGINE_REF= new QName(SecurityNamespaceHandler.NAMESPACE, "TrustEngineRef");
-   
-    /** {@inheritDoc} */
-    @Override protected Class<?> getBeanClass(Element element) {
-        return ChainingSignatureTrustEngineFactory.class;
-    }
-
     /** {@inheritDoc} */
     @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
         super.doParse(element, parserContext, builder);
@@ -56,14 +43,17 @@
         final List<Element> childEngines =
                 ElementSupport.getChildElements(element, SecurityNamespaceHandler.TRUST_ENGINE_ELEMENT_NAME);
         final List<Element> childEngineRefs =
-                ElementSupport.getChildElements(element, TRUST_ENGINE_REF);
+                ElementSupport.getChildElements(element, SecurityNamespaceHandler.TRUST_ENGINE_REF);
         
         final List<BeanMetadataElement> allChildren = new ManagedList<>(childEngines.size()+ childEngineRefs.size());
         
         allChildren.addAll(SpringSupport.parseCustomElements(childEngines, parserContext));
         
         for (Element ref:childEngineRefs) {
-            allChildren.add(new RuntimeBeanReference(StringSupport.trim(ref.getTextContent())));
+            final String reference = ref.getAttributeNS(null, "ref");
+            if (null != reference) {
+                allChildren.add(new RuntimeBeanReference(StringSupport.trim(reference)));
+            }
         }
         builder.addConstructorArgValue(allChildren);
     }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java?rev=7361&r1=7360&r2=7361&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java Sun Feb 22 10:00:49 2015
@@ -17,54 +17,22 @@
 
 package net.shibboleth.idp.profile.spring.relyingparty.security.trustengine;
 

[... 53 lines stripped ...]