[java-opensaml COMMIT] in /trunk: opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/WSAddressingConstant...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Nov  5 22:13:59 2015
New Revision: 4391

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4391&view=rev
Log:
Make WS-Addressing AddActionHandler emit the appropriate URI when a Fault is registered. 

Modified:
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/WSAddressingConstants.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/messaging/WSAddressingContext.java
    trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
    trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandlerTest.java

Modified: trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/WSAddressingConstants.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/WSAddressingConstants.java?rev=4391&r1=4390&r2=4391&view=diff
==============================================================================
--- trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/WSAddressingConstants.java	(original)
+++ trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/WSAddressingConstants.java	Thu Nov  5 22:13:59 2015
@@ -17,7 +17,11 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import java.util.Set;
+
 import javax.xml.namespace.QName;
+
+import com.google.common.collect.Sets;
 
 /**
  * WS-Addressing 1.0 constants.
@@ -79,6 +83,31 @@
     public static final QName SOAP_FAULT_ENDPOINT_UNAVAILABLE =
         new QName(WSA_NS, "EndpointUnavailable", WSA_PREFIX);
     
+    /** Set of all WS-Addressing SOAP fault codes. */
+    public static final Set<QName> WS_ADDRESSING_FAULTS = Sets.<QName>newHashSet(
+            SOAP_FAULT_INVALID_ADDRESSING_HEADER, 
+            SOAP_FAULT_INVALID_ADDRESS,
+            SOAP_FAULT_INVALID_EPR,
+            SOAP_FAULT_INVALID_CARDINALITY,
+            SOAP_FAULT_MISSING_ADDRESS_IN_EPR,
+            SOAP_FAULT_DUPLICATE_MESSAGE_ID,
+            SOAP_FAULT_ACTION_MISMATCH,
+            SOAP_FAULT_MESSAGE_ADDRESSING_HEADER_REQUIRED,
+            SOAP_FAULT_DESTINATION_UNREACHABLE,
+            SOAP_FAULT_ACTION_NOT_SUPPORTED,
+            SOAP_FAULT_ENDPOINT_UNAVAILABLE
+            );
+    
+    
+    // Fault Action URIs
+    
+    /** WS-Addressing Action URI for messages carrying WS-Addressing Faults ONLY. */
+    public static final String ACTION_URI_FAULT = "http://www.w3.org/2005/08/addressing/fault";
+    
+    /** WS-Addressing Action URI for messages carrying non-WS-Addressing Faults. */
+    public static final String ACTION_URI_SOAP_FAULT = "http://www.w3.org/2005/08/addressing/soap/fault";
+    
+    
     /** Prevent instantiation. */
     private WSAddressingConstants() {
         

Modified: trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/messaging/WSAddressingContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/messaging/WSAddressingContext.java?rev=4391&r1=4390&r2=4391&view=diff
==============================================================================
--- trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/messaging/WSAddressingContext.java	(original)
+++ trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/messaging/WSAddressingContext.java	Thu Nov  5 22:13:59 2015
@@ -31,6 +31,9 @@
     /** The Action URI value. */
     private String actionURI;
     
+    /** The Fault Action URI value. */
+    private String faultActionURI;
+    
     /** The MessageID URI value. */
     private String messageIDURI;
     
@@ -56,6 +59,24 @@
      */
     public void setActionURI(String uri) {
         actionURI = StringSupport.trimOrNull(uri);
+    }
+    
+    /**
+     * Get the Fault Action URI value.
+     * 
+     * @return the fault action URI.
+     */
+    public String getFaultActionURI() {
+        return faultActionURI;
+    }
+
+    /**
+     * Set the Fault Action URI value.
+     * 
+     * @param uri the new Fault Action URI value
+     */
+    public void setFaultActionURI(String uri) {
+        faultActionURI = StringSupport.trimOrNull(uri);
     }
     
     /**

Modified: trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java?rev=4391&r1=4390&r2=4391&view=diff
==============================================================================
--- trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java	(original)
+++ trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java	Thu Nov  5 22:13:59 2015
@@ -19,6 +19,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.xml.namespace.QName;
 

[... 230 lines stripped ...]