From 037eff184b25b7c2fa67782f7bac14575b1c8348 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian.f.cole@gmail.com>
Date: Sun, 27 Jan 2013 21:13:09 -0800
Subject: [PATCH] soapenv:mustUnderstand was in wrong position

---
 .../jclouds/ultradns/ws/filters/SOAPWrapWithPasswordAuth.java | 4 ++--
 labs/ultradns-ws/src/test/resources/clear_task.xml            | 2 +-
 labs/ultradns-ws/src/test/resources/get_current_account.xml   | 2 +-
 labs/ultradns-ws/src/test/resources/get_task.xml              | 2 +-
 labs/ultradns-ws/src/test/resources/get_zone.xml              | 2 +-
 labs/ultradns-ws/src/test/resources/list_tasks.xml            | 2 +-
 labs/ultradns-ws/src/test/resources/list_zones_by_account.xml | 2 +-
 .../src/test/resources/list_zones_by_account_and_type.xml     | 2 +-
 labs/ultradns-ws/src/test/resources/run_test.xml              | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/labs/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/filters/SOAPWrapWithPasswordAuth.java b/labs/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/filters/SOAPWrapWithPasswordAuth.java
index badc69ab8a..dfd3848a56 100644
--- a/labs/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/filters/SOAPWrapWithPasswordAuth.java
+++ b/labs/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/filters/SOAPWrapWithPasswordAuth.java
@@ -39,9 +39,9 @@ public class SOAPWrapWithPasswordAuth implements HttpRequestFilter {
    static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
    static final String PASSWORD_TEXT = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText";
    static final String SOAP_PREFIX = new StringBuilder()
-         .append("<soapenv:Envelope soapenv:mustUnderstand=\"1\" xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" ")
+         .append("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" ")
          .append("xmlns:v01=\"http://webservice.api.ultra.neustar.com/v01/\"><soapenv:Header>")
-         .append("<wsse:Security xmlns:wsse=\"").append(WSSE_NS).append("\"><wsse:UsernameToken>")
+         .append("<wsse:Security soapenv:mustUnderstand=\"1\" xmlns:wsse=\"").append(WSSE_NS).append("\"><wsse:UsernameToken>")
          .append("<wsse:Username>%s</wsse:Username>")
          .append("<wsse:Password Type=\"").append(PASSWORD_TEXT).append("\">%s</wsse:Password>")
          .append("</wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body>").toString();
diff --git a/labs/ultradns-ws/src/test/resources/clear_task.xml b/labs/ultradns-ws/src/test/resources/clear_task.xml
index 30dc7a4cbd..a6dbfb37f9 100644
--- a/labs/ultradns-ws/src/test/resources/clear_task.xml
+++ b/labs/ultradns-ws/src/test/resources/clear_task.xml
@@ -1 +1 @@
-<soapenv:Envelope soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:clearTask><id><guid>0b40c7dd-748d-4c49-8506-26f0c7d2ea9c</guid></id></v01:clearTask></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security soapenv:mustUnderstand="1" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:clearTask><id><guid>0b40c7dd-748d-4c49-8506-26f0c7d2ea9c</guid></id></v01:clearTask></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
diff --git a/labs/ultradns-ws/src/test/resources/get_current_account.xml b/labs/ultradns-ws/src/test/resources/get_current_account.xml
index 2505ea78df..d6b72840ce 100644
--- a/labs/ultradns-ws/src/test/resources/get_current_account.xml
+++ b/labs/ultradns-ws/src/test/resources/get_current_account.xml
@@ -1 +1 @@
-<soapenv:Envelope soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getAccountsListOfUser/></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security soapenv:mustUnderstand="1" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getAccountsListOfUser/></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
diff --git a/labs/ultradns-ws/src/test/resources/get_task.xml b/labs/ultradns-ws/src/test/resources/get_task.xml
index 64350f572e..c463a3e592 100644
--- a/labs/ultradns-ws/src/test/resources/get_task.xml
+++ b/labs/ultradns-ws/src/test/resources/get_task.xml
@@ -1 +1 @@
-<soapenv:Envelope soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getStatusForTask><id><guid>0b40c7dd-748d-4c49-8506-26f0c7d2ea9c</guid></id></v01:getStatusForTask></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security soapenv:mustUnderstand="1" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getStatusForTask><id><guid>0b40c7dd-748d-4c49-8506-26f0c7d2ea9c</guid></id></v01:getStatusForTask></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
diff --git a/labs/ultradns-ws/src/test/resources/get_zone.xml b/labs/ultradns-ws/src/test/resources/get_zone.xml
index 9b542d5464..36ba645648 100644
--- a/labs/ultradns-ws/src/test/resources/get_zone.xml
+++ b/labs/ultradns-ws/src/test/resources/get_zone.xml
@@ -1 +1 @@
-<soapenv:Envelope soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getGeneralPropertiesForZone><zoneName>jclouds.org.</zoneName></v01:getGeneralPropertiesForZone></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security soapenv:mustUnderstand="1" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getGeneralPropertiesForZone><zoneName>jclouds.org.</zoneName></v01:getGeneralPropertiesForZone></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
diff --git a/labs/ultradns-ws/src/test/resources/list_tasks.xml b/labs/ultradns-ws/src/test/resources/list_tasks.xml
index c373b974d0..d2c5588dc6 100644
--- a/labs/ultradns-ws/src/test/resources/list_tasks.xml
+++ b/labs/ultradns-ws/src/test/resources/list_tasks.xml
@@ -1 +1 @@
-<soapenv:Envelope soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getAllTasks/></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security soapenv:mustUnderstand="1" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getAllTasks/></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
diff --git a/labs/ultradns-ws/src/test/resources/list_zones_by_account.xml b/labs/ultradns-ws/src/test/resources/list_zones_by_account.xml
index ad39bbabe2..fc22e55779 100644
--- a/labs/ultradns-ws/src/test/resources/list_zones_by_account.xml
+++ b/labs/ultradns-ws/src/test/resources/list_zones_by_account.xml
@@ -1 +1 @@
-<soapenv:Envelope soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getZonesOfAccount><accountId>AAAAAAAAAAAAAAAA</accountId><zoneType>all</zoneType></v01:getZonesOfAccount></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security soapenv:mustUnderstand="1" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getZonesOfAccount><accountId>AAAAAAAAAAAAAAAA</accountId><zoneType>all</zoneType></v01:getZonesOfAccount></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
diff --git a/labs/ultradns-ws/src/test/resources/list_zones_by_account_and_type.xml b/labs/ultradns-ws/src/test/resources/list_zones_by_account_and_type.xml
index a56dbba5c8..84db0800c5 100644
--- a/labs/ultradns-ws/src/test/resources/list_zones_by_account_and_type.xml
+++ b/labs/ultradns-ws/src/test/resources/list_zones_by_account_and_type.xml
@@ -1 +1 @@
-<soapenv:Envelope soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getZonesOfAccount><accountId>AAAAAAAAAAAAAAAA</accountId><zoneType>primary</zoneType></v01:getZonesOfAccount></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security soapenv:mustUnderstand="1" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:getZonesOfAccount><accountId>AAAAAAAAAAAAAAAA</accountId><zoneType>primary</zoneType></v01:getZonesOfAccount></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
diff --git a/labs/ultradns-ws/src/test/resources/run_test.xml b/labs/ultradns-ws/src/test/resources/run_test.xml
index ccda986c44..caa0d7bb2b 100644
--- a/labs/ultradns-ws/src/test/resources/run_test.xml
+++ b/labs/ultradns-ws/src/test/resources/run_test.xml
@@ -1 +1 @@
-<soapenv:Envelope soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:runTest><value>foo</value></v01:runTest></soapenv:Body></soapenv:Envelope>
\ No newline at end of file
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security soapenv:mustUnderstand="1" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:runTest><value>foo</value></v01:runTest></soapenv:Body></soapenv:Envelope>
\ No newline at end of file