[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegatio...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Nov  6 16:59:57 2015
New Revision: 7960

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7960&view=rev
Log:
Extend new abstract SOAP header generating handler class.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/AddFrameworkHandler.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/AddSenderHandler.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/AddFrameworkHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/AddFrameworkHandler.java?rev=7960&r1=7959&r2=7960&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/AddFrameworkHandler.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/AddFrameworkHandler.java	Fri Nov  6 16:59:57 2015
@@ -26,16 +26,16 @@
 import org.openliberty.xmltooling.soapbinding.Framework;
 import org.opensaml.core.xml.util.XMLObjectSupport;
 import org.opensaml.messaging.context.MessageContext;
-import org.opensaml.messaging.handler.AbstractMessageHandler;
 import org.opensaml.messaging.handler.MessageHandlerException;
 import org.opensaml.soap.messaging.SOAPMessagingSupport;
+import org.opensaml.soap.messaging.impl.AbstractHeaderGeneratingMessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Handler implementation that adds a Liberty sbf:Framework header to the outbound SOAP envelope.
  */
-public class AddFrameworkHandler extends AbstractMessageHandler {
+public class AddFrameworkHandler extends AbstractHeaderGeneratingMessageHandler {
     
     /** Default Framework version. */
     public static final String DEFAULT_VERSION = "2.0";
@@ -71,6 +71,7 @@
         log.debug("Issuing Liberty ID-WSF Framework header with version value: {}", getVersion());
         Framework framework = (Framework) XMLObjectSupport.buildXMLObject(Framework.DEFAULT_ELEMENT_NAME);
         framework.setVersion(getVersion());
+        decorateGeneratedHeader(messageContext, framework);
         SOAPMessagingSupport.addHeaderBlock(messageContext, framework);
     }
 

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/AddSenderHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/AddSenderHandler.java?rev=7960&r1=7959&r2=7960&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/AddSenderHandler.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/AddSenderHandler.java	Fri Nov  6 16:59:57 2015
@@ -27,10 +27,10 @@
 import org.openliberty.xmltooling.soapbinding.Sender;
 import org.opensaml.core.xml.util.XMLObjectSupport;
 import org.opensaml.messaging.context.MessageContext;
-import org.opensaml.messaging.handler.AbstractMessageHandler;
 import org.opensaml.messaging.handler.MessageHandlerException;
 import org.opensaml.saml.common.messaging.context.SAMLSelfEntityContext;
 import org.opensaml.soap.messaging.SOAPMessagingSupport;
+import org.opensaml.soap.messaging.impl.AbstractHeaderGeneratingMessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +39,7 @@
 /**
  * Handler implementation that adds a Liberty sb:Sender header to the outbound SOAP envelope.
  */
-public class AddSenderHandler extends AbstractMessageHandler {
+public class AddSenderHandler extends AbstractHeaderGeneratingMessageHandler {
     
     /** Logger. */
     private Logger log = LoggerFactory.getLogger(AddSenderHandler.class);
@@ -86,6 +86,7 @@
         log.debug("Issuing Liberty ID-WSF Sender with providerId value: {}", providerId);
         Sender sender = (Sender) XMLObjectSupport.buildXMLObject(LibertyConstants.SOAP_BINDING_SENDER_ELEMENT_NAME);
         sender.setProviderID(providerId);
+        decorateGeneratedHeader(messageContext, sender);
         SOAPMessagingSupport.addHeaderBlock(messageContext, sender);
     }