You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/10/07 08:33:35 UTC

svn commit: r1395227 - in /axis/axis1/java/trunk/interop-mock/src/main: java/org/apache/axis/test/interop/mock/ resources/w3c/ resources/w3c/soap12-part1/ resources/w3c/soap12-testcollection/ resources/w3c/variants/ resources/whitemesa/ resources/white...

Author: veithen
Date: Sun Oct  7 06:33:33 2012
New Revision: 1395227

URL: http://svn.apache.org/viewvc?rev=1395227&view=rev
Log:
Further enhanced the interop mock. Now all message tests in WhiteMesaSoap12AddTestSvcTestCase pass.

Added:
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/README.txt   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/soap11-version-mismatch-fault.xml   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/README.txt
      - copied, changed from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-1-request.xml
      - copied unchanged from r1393525, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-1-response.xml
      - copied unchanged from r1393588, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-11-request.xml
      - copied, changed from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-11-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-11-response.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-11-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-12-request.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-12-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-12-response.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-12-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-2-response.xml
      - copied unchanged from r1393525, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-2-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-3-response.xml
      - copied unchanged from r1393588, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-3-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-4-request.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-4-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-4-response.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-4-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-5-request.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-5-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-5-response.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-5-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-6-request.xml
      - copied, changed from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-6-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-6-response.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-6-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-7-request.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-7-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-7-response.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-7-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-8-request.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-8-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-8-response.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-8-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-9-request.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-9-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-9-response.xml
      - copied unchanged from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-9-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int-uc/
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int-uc/README.txt   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int-uc/XMLP-14-request.xml
      - copied unchanged from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-14-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int-uc/XMLP-14-response.xml
      - copied unchanged from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-14-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/README.txt   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-13.xml
      - copied unchanged from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-13.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-15-request.xml
      - copied unchanged from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-15-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-15-response.xml
      - copied unchanged from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-15-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-16.xml
      - copied unchanged from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-16.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-17.xml   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-18.xml   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-request.xml   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-response.xml   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/README.txt   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-11-request.xml   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-12-request.xml
      - copied unchanged from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/variants/XMLP-12-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-5-request.xml   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-9-request.xml   (with props)
Removed:
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-11-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-11-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-12-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-12-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-2-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-3-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-4-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-4-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-5-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-5-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-6-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-6-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-7-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-7-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-8-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-8-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-9-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-9-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/variants/
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-13.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-14-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-14-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-15-request.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-15-response.xml
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/XMLP-16.xml
Modified:
    axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java
    axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/README.txt
    axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml

Modified: axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java?rev=1395227&r1=1395226&r2=1395227&view=diff
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java (original)
+++ axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java Sun Oct  7 06:33:33 2012
@@ -18,6 +18,9 @@
  */
 package org.apache.axis.test.interop.mock;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.el.ELContext;
 import javax.el.ExpressionFactory;
 import javax.xml.XMLConstants;
@@ -151,11 +154,22 @@ public class Exchange implements Initial
     private boolean match(Element expected, Element actual, Variables inferredVariables) {
         String namespaceURI = expected.getNamespaceURI();
         String localName = expected.getLocalName();
+        String attributesVariableName;
         // Check if the element in the actual request is a template construct
         if (MOCK_NS.equals(namespaceURI)) {
             if (localName.equals("element")) {
                 inferredVariables.bind(checkVariable(expected.getAttributeNS(MOCK_NS, "name")),
                         QName.class, new QName(actual.getNamespaceURI(), actual.getLocalName()));
+                Attr attributesAttr = expected.getAttributeNodeNS(MOCK_NS, "attributes");
+                if (attributesAttr == null) {
+                    attributesVariableName = null;
+                } else {
+                    attributesVariableName = checkVariable(attributesAttr.getValue());
+                    if (attributesVariableName == null) {
+                        log.error("Expected variable at " + getLocation(attributesAttr));
+                        return false;
+                    }
+                }
             } else {
                 log.error("Unexpected template element " + localName);
                 return false;
@@ -174,6 +188,7 @@ public class Exchange implements Initial
                 }
                 return false;
             }
+            attributesVariableName = null;
         }
         
         // Compare attributes
@@ -203,18 +218,31 @@ public class Exchange implements Initial
                 }
             }
         }
-        // Check that there are no unexpected attributes
-        for (int i=0; i<actualAttributes.getLength(); i++) {
-            Attr actualAttribute = (Attr)actualAttributes.item(i);
-            String attrNamespaceURI = actualAttribute.getNamespaceURI();
-            if (!XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(attrNamespaceURI) &&
-                    expectedAttributes.getNamedItemNS(attrNamespaceURI, actualAttribute.getLocalName()) == null) {
-                if (log.isDebugEnabled()) {
-                    log.debug("Unexpected attribute at " + getLocation(expected) + ": uri=" + actualAttribute.getNamespaceURI()
-                            + "; name=" + actualAttribute.getLocalName());
+        if (attributesVariableName == null) {
+            // Check that there are no unexpected attributes
+            for (int i=0, l=actualAttributes.getLength(); i<l; i++) {
+                Attr actualAttribute = (Attr)actualAttributes.item(i);
+                String attrNamespaceURI = actualAttribute.getNamespaceURI();
+                if (!XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(attrNamespaceURI) &&
+                        expectedAttributes.getNamedItemNS(attrNamespaceURI, actualAttribute.getLocalName()) == null) {
+                    if (log.isDebugEnabled()) {
+                        log.debug("Unexpected attribute at " + getLocation(expected) + ": uri=" + actualAttribute.getNamespaceURI()
+                                + "; name=" + actualAttribute.getLocalName());
+                    }
+                    return false;
+                }
+            }
+        } else {
+            List<Attr> attributes = new ArrayList<Attr>();
+            for (int i=0, l=actualAttributes.getLength(); i<l; i++) {
+                Attr actualAttribute = (Attr)actualAttributes.item(i);
+                String attrNamespaceURI = actualAttribute.getNamespaceURI();
+                if (!XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(attrNamespaceURI) &&
+                        expectedAttributes.getNamedItemNS(attrNamespaceURI, actualAttribute.getLocalName()) == null) {
+                    attributes.add(actualAttribute);
                 }
-                return false;
             }
+            inferredVariables.bind(attributesVariableName, Attr[].class, attributes.toArray(new Attr[attributes.size()]));
         }
         
         // Compare children

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/README.txt
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/README.txt?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/README.txt (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/README.txt Sun Oct  7 06:33:33 2012
@@ -0,0 +1 @@
+This folder contains messages from http://www.w3.org/TR/2007/REC-soap12-part1-20070427/.
\ No newline at end of file

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/soap11-version-mismatch-fault.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/soap11-version-mismatch-fault.xml?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/soap11-version-mismatch-fault.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/soap11-version-mismatch-fault.xml Sun Oct  7 06:33:33 2012
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
+ <env:Header>
+  <env:Upgrade>
+   <env:SupportedEnvelope qname="ns1:Envelope" 
+             xmlns:ns1="http://www.w3.org/2003/05/soap-envelope"/>
+   </env:Upgrade>
+  </env:Header>
+  <env:Body>
+   <env:Fault>
+    <faultcode>env:VersionMismatch</faultcode>
+    <faultstring>Version Mismatch</faultstring>
+   </env:Fault>
+ </env:Body>
+</env:Envelope>

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-part1/soap11-version-mismatch-fault.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/README.txt (from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/README.txt?p2=axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/README.txt&p1=axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt&r1=1394998&r2=1395227&rev=1395227&view=diff
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt (original)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/README.txt Sun Oct  7 06:33:33 2012
@@ -6,6 +6,7 @@ with corrections for the following mista
     code and subcode values.
   * Request messages for the echoSimpleTypesAsStruct operation use inputInt as parameter name, but
     in the description the parameter is called inputInteger (see XMLP-4).
+  * The request shown in XMLP-6 has a typo (encodingstyle instead of encodingStyle).
   * The response shown in XMLP-9 has a typo (</env:value> instead of </env:Value>).
   * The response shown in XMLP-14 has a typo (<inputString> instead of </inputString>).
 

Copied: axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-11-request.xml (from r1394241, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-11-request.xml)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-11-request.xml?p2=axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-11-request.xml&p1=axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-11-request.xml&r1=1394241&r2=1395227&rev=1395227&view=diff
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-11-request.xml (original)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-11-request.xml Sun Oct  7 06:33:33 2012
@@ -5,7 +5,7 @@
   <env:Body>
     <sb:echoInteger xmlns:sb="http://soapinterop.org/"
         env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-      <inputInteger xsi:type="xsd:int">${inputInteger}</inputInteger>
+      <inputInteger xsi:type="xsd:int">abc</inputInteger>
     </sb:echoInteger>
   </env:Body>
 </env:Envelope>

Copied: axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-6-request.xml (from r1394998, axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-6-request.xml)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-6-request.xml?p2=axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-6-request.xml&p1=axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-6-request.xml&r1=1394998&r2=1395227&rev=1395227&view=diff
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-6-request.xml (original)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/soap12-testcollection/XMLP-6-request.xml Sun Oct  7 06:33:33 2012
@@ -1,12 +1,12 @@
 <?xml version="1.0" ?>
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">
   <env:Header>
-    <t:element xmlns:t="http://axis.apache.org/mock/template" t:name="${headerName}"
+    <t:element xmlns:t="http://axis.apache.org/mock/template" t:name="${headerName}" t:attributes="${headerAttributes}"
          env:mustUnderstand="1"
          env:role="http://www.w3.org/2003/05/soap-envelope/role/next">${content}</t:element>
   </env:Header>
   <env:Body>
     <sb:echoVoid xmlns:sb="http://soapinterop.org/"
-        env:encodingstyle="http://www.w3.org/2003/05/soap-encoding" />
+        env:encodingStyle="http://www.w3.org/2003/05/soap-encoding" />
   </env:Body>
 </env:Envelope>

Modified: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/README.txt
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/README.txt?rev=1395227&r1=1395226&r2=1395227&view=diff
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/README.txt (original)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/README.txt Sun Oct  7 06:33:33 2012
@@ -1,5 +1,3 @@
 The request/response messages in this folder have been designed to make the
-WhiteMesaSoap12AddTestSvcTestCase in Axis 1.4 pass (the original endpoint at
-www.whitemesa.net is no longer available). Note that they are not compatible with the messages
-specified in http://www.w3.org/TR/2007/REC-soap12-testcollection-20070427/ because the
-whitemesa endpoint used doc/lit, while the W3C messages use rpc/encoded.
\ No newline at end of file
+WhiteMesaSoap12AddTestSvcTestCase in Axis 1.4 pass. The original endpoint at
+www.whitemesa.net is no longer available.
\ No newline at end of file

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int-uc/README.txt
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int-uc/README.txt?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int-uc/README.txt (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int-uc/README.txt Sun Oct  7 06:33:33 2012
@@ -0,0 +1,3 @@
+The messages in this folder are not compatible with the messages specified in
+http://www.w3.org/TR/2007/REC-soap12-testcollection-20070427/. The reason is that the whitemesa
+endpoint used doc/lit, while the endpoint in the W3C spec uses rpc/encoded.
\ No newline at end of file

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int-uc/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/README.txt
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/README.txt?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/README.txt (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/README.txt Sun Oct  7 06:33:33 2012
@@ -0,0 +1,3 @@
+The messages in this folder are not compatible with the messages specified in
+http://www.w3.org/TR/2007/REC-soap12-testcollection-20070427/. The reason is that the whitemesa
+endpoint used doc/lit, while the endpoint in the W3C spec uses rpc/encoded.
\ No newline at end of file

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-17.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-17.xml?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-17.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-17.xml Sun Oct  7 06:33:33 2012
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
+              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Header>
+    <ns:seekrit xmlns:ns="http://test-xmlp-17" env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver" xsi:type="xsd:string">${headerValue}</ns:seekrit>
+  </env:Header>
+  <env:Body>
+    <sb:echoString xmlns:sb="http://soapinterop.org/"
+        env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
+      <inputString xsi:type="xsd:string">${inputString}</inputString>
+    </sb:echoString>
+  </env:Body>
+</env:Envelope>

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-17.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-18.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-18.xml?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-18.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-18.xml Sun Oct  7 06:33:33 2012
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
+              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Header>
+    <ns:seekrit xmlns:ns="http://test-xmlp-17" env:role="http://www.w3.org/2003/05/soap-envelope/role/next" env:relay="true" xsi:type="xsd:string">${headerValue}</ns:seekrit>
+  </env:Header>
+  <env:Body>
+    <sb:echoString xmlns:sb="http://soapinterop.org/"
+        env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
+      <inputString xsi:type="xsd:string">${inputString}</inputString>
+    </sb:echoString>
+  </env:Body>
+</env:Envelope>

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-18.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-request.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-request.xml?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-request.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-request.xml Sun Oct  7 06:33:33 2012
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
+              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Header>
+    <ns:seekrit xmlns:ns="http://test-xmlp-17" env:role="http://www.w3.org/2003/05/soap-envelope/role/next" env:mustUnderstand="1" xsi:type="xsd:string">${headerValue}</ns:seekrit>
+  </env:Header>
+  <env:Body>
+    <sb:echoString xmlns:sb="http://soapinterop.org/"
+        env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
+      <inputString xsi:type="xsd:string">${inputString}</inputString>
+    </sb:echoString>
+  </env:Body>
+</env:Envelope>

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-request.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-response.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-response.xml?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-response.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-response.xml Sun Oct  7 06:33:33 2012
@@ -0,0 +1,17 @@
+<?xml version='1.0' ?>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">
+  <env:Header>
+    <env:NotUnderstood qname="ns:seekrit"
+         xmlns:ns="http://test-xmlp-17" />
+  </env:Header>
+  <env:Body>
+    <env:Fault>
+      <env:Code>
+        <env:Value>env:MustUnderstand</env:Value>
+      </env:Code>
+      <env:Reason>
+        <env:Text xml:lang="en-US"> Header not understood </env:Text>
+      </env:Reason>
+    </env:Fault>
+  </env:Body>
+</env:Envelope>

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-doc-int/XMLP-19-response.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/README.txt
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/README.txt?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/README.txt (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/README.txt Sun Oct  7 06:33:33 2012
@@ -0,0 +1,2 @@
+Messages in this folder are variants of the messages specified by
+http://www.w3.org/TR/2007/REC-soap12-testcollection-20070427/.
\ No newline at end of file

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-11-request.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-11-request.xml?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-11-request.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-11-request.xml Sun Oct  7 06:33:33 2012
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
+              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <sb:echoInteger xmlns:sb="http://soapinterop.org/"
+        env:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
+      <inputInteger>ceci n'est pas un int</inputInteger>
+    </sb:echoInteger>
+  </env:Body>
+</env:Envelope>

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-11-request.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-5-request.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-5-request.xml?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-5-request.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-5-request.xml Sun Oct  7 06:33:33 2012
@@ -0,0 +1,7 @@
+<?xml version="1.0" ?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
+              xmlns:enc="http://schemas.xmlsoap.org/soap/encoding/">
+  <env:Body>
+    <sb:echoVoid xmlns:sb="http://soapinterop.org/" env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+  </env:Body>
+</env:Envelope>

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-5-request.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-9-request.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-9-request.xml?rev=1395227&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-9-request.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-9-request.xml Sun Oct  7 06:33:33 2012
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" 
+              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <sb:echoString xmlns:sb="http://soapinterop.org/">
+      <inputString env:encodingStyle="http://this-is-a-bad-encoding-style">${inputString}</inputString>
+    </sb:echoString>
+  </env:Body>
+</env:Envelope>

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/add-test-rpc/XMLP-9-request.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1395227&r1=1395226&r2=1395227&view=diff
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml (original)
+++ axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml Sun Oct  7 06:33:33 2012
@@ -33,59 +33,74 @@
         <property name="exchanges">
             <list>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:w3c/XMLP-1-request.xml"/>
-                    <property name="response" value="classpath:w3c/XMLP-1-response.xml"/>
+                    <property name="request" value="classpath:w3c/soap12-testcollection/XMLP-1-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-1-response.xml"/>
                 </bean>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:w3c/XMLP-4-request.xml"/>
-                    <property name="response" value="classpath:w3c/XMLP-4-response.xml"/>
+                    <property name="request" value="classpath:w3c/soap12-testcollection/XMLP-4-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-4-response.xml"/>
                 </bean>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:w3c/XMLP-5-request.xml"/>
-                    <property name="response" value="classpath:w3c/XMLP-5-response.xml"/>
+                    <property name="request" value="classpath:w3c/soap12-testcollection/XMLP-5-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-5-response.xml"/>
                 </bean>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:w3c/XMLP-6-request.xml"/>
-                    <property name="response" value="classpath:w3c/XMLP-6-response.xml"/>
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-rpc/XMLP-5-request.xml"/>
+                    <!-- The response specified for the XMLP-5 test case is valid for nodes that only implement
+                         SOAP 1.2. Here we assume that the node implements both SOAP 1.1 and 1.2. In that case,
+                         appendix A of the SOAP 1.2 specification applies. -->
+                    <property name="response" value="classpath:w3c/soap12-part1/soap11-version-mismatch-fault.xml"/>
                 </bean>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:w3c/XMLP-9-request.xml"/>
-                    <property name="response" value="classpath:w3c/XMLP-9-response.xml"/>
+                    <property name="request" value="classpath:w3c/soap12-testcollection/XMLP-6-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-6-response.xml"/>
                 </bean>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:w3c/XMLP-11-request.xml"/>
-                    <property name="response" value="classpath:w3c/XMLP-11-response.xml"/>
+                    <property name="request" value="classpath:w3c/soap12-testcollection/XMLP-9-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-9-response.xml"/>
                 </bean>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:w3c/XMLP-12-request.xml"/>
-                    <property name="response" value="classpath:w3c/XMLP-12-response.xml"/>
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-rpc/XMLP-9-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-9-response.xml"/>
                 </bean>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:w3c/variants/XMLP-12-request.xml"/>
-                    <property name="response" value="classpath:w3c/XMLP-12-response.xml"/>
+                    <property name="request" value="classpath:w3c/soap12-testcollection/XMLP-11-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-11-response.xml"/>
+                </bean>
+                <bean class="org.apache.axis.test.interop.mock.Exchange">
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-rpc/XMLP-11-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-11-response.xml"/>
+                </bean>
+                <bean class="org.apache.axis.test.interop.mock.Exchange">
+                    <property name="request" value="classpath:w3c/soap12-testcollection/XMLP-12-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-12-response.xml"/>
+                </bean>
+                <bean class="org.apache.axis.test.interop.mock.Exchange">
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-rpc/XMLP-12-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-12-response.xml"/>
                 </bean>
             </list>
         </property>
     </bean>
     
     <bean name="/soap12/add-test-doc/getTime" class="org.apache.axis.test.interop.mock.MockGetHandler">
-        <property name="response" value="classpath:w3c/XMLP-2-response.xml"/>
+        <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-2-response.xml"/>
     </bean>
     
     <bean name="/soap12/add-test-rpc/getTime" class="org.apache.axis.test.interop.mock.MockGetHandler">
-        <property name="response" value="classpath:w3c/XMLP-3-response.xml"/>
+        <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-3-response.xml"/>
     </bean>
 
     <bean name="/soap12/add-test-doc" class="org.apache.axis.test.interop.mock.MockPostHandler">
         <property name="exchanges">
             <list>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:w3c/XMLP-7-request.xml"/>
-                    <property name="response" value="classpath:w3c/XMLP-7-response.xml"/>
+                    <property name="request" value="classpath:w3c/soap12-testcollection/XMLP-7-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-7-response.xml"/>
                 </bean>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:w3c/XMLP-8-request.xml"/>
-                    <property name="response" value="classpath:w3c/XMLP-8-response.xml"/>
+                    <property name="request" value="classpath:w3c/soap12-testcollection/XMLP-8-request.xml"/>
+                    <property name="response" value="classpath:w3c/soap12-testcollection/XMLP-8-response.xml"/>
                 </bean>
             </list>
         </property>
@@ -100,16 +115,28 @@
         <property name="exchanges">
             <list>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:whitemesa/XMLP-13.xml"/>
-                    <property name="response" value="classpath:whitemesa/XMLP-13.xml"/>
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-13.xml"/>
+                    <property name="response" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-13.xml"/>
+                </bean>
+                <bean class="org.apache.axis.test.interop.mock.Exchange">
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-15-request.xml"/>
+                    <property name="response" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-15-response.xml"/>
+                </bean>
+                <bean class="org.apache.axis.test.interop.mock.Exchange">
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-16.xml"/>
+                    <property name="response" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-16.xml"/>
+                </bean>
+                <bean class="org.apache.axis.test.interop.mock.Exchange">
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-17.xml"/>
+                    <property name="response" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-17.xml"/>
                 </bean>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:whitemesa/XMLP-15-request.xml"/>
-                    <property name="response" value="classpath:whitemesa/XMLP-15-response.xml"/>
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-18.xml"/>
+                    <property name="response" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-18.xml"/>
                 </bean>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:whitemesa/XMLP-16.xml"/>
-                    <property name="response" value="classpath:whitemesa/XMLP-16.xml"/>
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-19-request.xml"/>
+                    <property name="response" value="classpath:whitemesa/soap12/add-test-doc-int/XMLP-19-response.xml"/>
                 </bean>
             </list>
         </property>
@@ -119,8 +146,8 @@
         <property name="exchanges">
             <list>
                 <bean class="org.apache.axis.test.interop.mock.Exchange">
-                    <property name="request" value="classpath:whitemesa/XMLP-14-request.xml"/>
-                    <property name="response" value="classpath:whitemesa/XMLP-14-response.xml"/>
+                    <property name="request" value="classpath:whitemesa/soap12/add-test-doc-int-uc/XMLP-14-request.xml"/>
+                    <property name="response" value="classpath:whitemesa/soap12/add-test-doc-int-uc/XMLP-14-response.xml"/>
                 </bean>
             </list>
         </property>