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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jan 23 06:57:46 2015
New Revision: 7275

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7275&view=rev
Log:
IDP-580  Put the Trust Engine inside the <MetadataFilter xsi:type="metadata:SignatureValidation">

Added:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline-filter.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java?rev=7275&r1=7274&r2=7275&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java Fri Jan 23 06:57:46 2015
@@ -126,15 +126,14 @@
             doNativeParse(element, parserContext, childBeanDefinitionBuilder);
 
             builder.addConstructorArgValue(childBeanDefinitionBuilder.getBeanDefinition());
-            
+
             if (element.hasAttributeNS(null, "sortKey")) {
                 builder.addPropertyValue("sortKey", element.getAttributeNS(null, "sortKey"));
             }
-            
         } else {
             if (element.hasAttributeNS(null, "sortKey")) {
-                log.warn("{} sortKey is only valid on 'top level' MetadataProviders", 
-                        parserContext.getReaderContext().getResource().getDescription());
+                log.warn("{} sortKey is only valid on 'top level' MetadataProviders", parserContext.getReaderContext()
+                        .getResource().getDescription());
             }
             doNativeParse(element, parserContext, builder);
         }
@@ -184,7 +183,11 @@
 
         final List<Element> trustEngines =
                 ElementSupport.getChildElements(element, SecurityNamespaceHandler.TRUST_ENGINE_ELEMENT_NAME);
-        SpringSupport.parseCustomElements(trustEngines, parserContext);
-
+        if (trustEngines != null && !trustEngines.isEmpty()) {
+            log.warn("{} Deprecated placement of <TrustEngine> inside <MetadataProvider>. "
+                    + "Place inside the relevant filter", parserContext.getReaderContext().getResource()
+                    .getDescription());
+            SpringSupport.parseCustomElements(trustEngines, parserContext);
+        }
     }
 }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java?rev=7275&r1=7274&r2=7275&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java Fri Jan 23 06:57:46 2015
@@ -22,7 +22,9 @@
 
 import javax.xml.namespace.QName;
 
+import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.MetadataNamespaceHandler;
+import net.shibboleth.idp.profile.spring.relyingparty.security.SecurityNamespaceHandler;
 import net.shibboleth.idp.profile.spring.relyingparty.security.credential.BasicInlineCredentialFactoryBean;
 import net.shibboleth.idp.profile.spring.relyingparty.security.credential.X509ResourceCredentialFactoryBean;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -66,11 +68,15 @@
     }
 
     // Checkstyle: CyclomaticComplexity OFF
+    // Checkstyle: MethodLength OFF
     /** {@inheritDoc} */
-    @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+    @Override protected void doParse(Element element, ParserContext parserContext, 
+            BeanDefinitionBuilder builder) {
         final boolean hasEngineRef = element.hasAttributeNS(null, "trustEngineRef");

[... 109 lines stripped ...]