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

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Feb 12 17:57:02 2015
New Revision: 7343

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7343&view=rev
Log:
Update to use new SpringSupport method.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java?rev=7343&r1=7342&r2=7343&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java Thu Feb 12 17:57:02 2015
@@ -21,6 +21,7 @@
 
 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.httpclient.HttpClientSupport;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -240,7 +241,7 @@
             Element trustEngine = ElementSupport.getFirstChildElement(tlsTrustEngine, 
                     SecurityNamespaceHandler.TRUST_ENGINE_ELEMENT_NAME);
             if (trustEngine != null) {
-                return parserContext.getDelegate().parseCustomElement(trustEngine);
+                return SpringSupport.parseCustomElement(trustEngine, parserContext);
             } else {
                 // This should be schema-invalid, but log a warning just in case.
                 log.warn("{}:, Element {} did not contain a {} child element", 

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java?rev=7343&r1=7342&r2=7343&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java Thu Feb 12 17:57:02 2015
@@ -19,6 +19,7 @@
 
 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.httpclient.HttpClientSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
@@ -248,7 +249,7 @@
             Element trustEngine = ElementSupport.getFirstChildElement(tlsTrustEngine, 
                     SecurityNamespaceHandler.TRUST_ENGINE_ELEMENT_NAME);
             if (trustEngine != null) {
-                return parserContext.getDelegate().parseCustomElement(trustEngine);
+                return SpringSupport.parseCustomElement(trustEngine, parserContext);
             } else {
                 // This should be schema-invalid, but log a warning just in case.
                 log.warn("{}:, Element {} did not contain a {} child element",