Correctly pass query strings through component wiring redirects and improve format of XML and JSON response documents.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1074924 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 71 insertions, 67 deletions

diff --git a/sca-cpp/trunk/modules/rss/rss-test.cpp b/sca-cpp/trunk/modules/rss/rss-test.cpp
index 0b773ba31e..c2c3eb9e8f 100644
--- a/sca-cpp/trunk/modules/rss/rss-test.cpp
+++ b/sca-cpp/trunk/modules/rss/rss-test.cpp
@@ -36,49 +36,51 @@ ostream* writer(const string& s, ostream* os) {
     return os;
 }
 
-string itemEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-        "<item>"
-        "<title>fruit</title>"
-        "<link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</link>"
-        "<description>"
-        "<item>"
-        "<name>Apple</name><price>$2.99</price>"
-        "</item>"
-        "</description>"
+const string itemEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        "<item>\n"
+        " <title>fruit</title>\n"
+        " <link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</link>\n"
+        " <description>\n"
+        "  <item>\n"
+        "   <name>Apple</name>\n"
+        "   <price>$2.99</price>\n"
+        "  </item>\n"
+        " </description>\n"
         "</item>\n");
 
-string itemTextEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-        "<item>"
-        "<title>fruit</title>"
-        "<link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</link>"
-        "<description>Apple</description>"
+const string itemTextEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        "<item>\n"
+        " <title>fruit</title>\n"
+        " <link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</link>\n"
+        " <description>Apple</description>\n"
         "</item>\n");
 
-string itemNoDescriptionEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-        "<item>"
-        "<title>fruit</title>"
-        "<link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</link>"
+const string itemNoDescriptionEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        "<item>\n"
+        " <title>fruit</title>\n"
+        " <link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</link>\n"
         "</item>\n");
 
-string incompleteEntry("<item>"
-        "<title>fruit</title><description>"
-        "<Item xmlns=\"http://services/\">"
-        "<name xmlns=\"\">Orange</name>"
-        "<price xmlns=\"\">3.55</price>"
-        "</Item>"
-        "</description>"
+const string incompleteEntry("<item>\n"
+        " <title>fruit</title>\n"
+        " <description>\n"
+        "  <Item xmlns=\"http://services/\">\n"
+        "   <name xmlns=\"\">Orange</name>\n"
+        "   <price xmlns=\"\">3.55</price>\n"
+        "  </Item>\n"
+        " </description>\n"
         "</item>");
 
-string completedEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-        "<item>"
-        "<title>fruit</title>"
-        "<link></link>"
-        "<description>"
-        "<Item xmlns=\"http://services/\">"
-        "<name xmlns=\"\">Orange</name>"
-        "<price xmlns=\"\">3.55</price>"
-        "</Item>"
-        "</description>"
+const string completedEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        "<item>\n"
+        " <title>fruit</title>\n"
+        " <link></link>\n"
+        " <description>\n"
+        "  <Item xmlns=\"http://services/\">\n"
+        "   <name xmlns=\"\">Orange</name>\n"
+        "   <price xmlns=\"\">3.55</price>\n"
+        "  </Item>\n"
+        " </description>\n"
         "</item>\n");
 
 bool testEntry() {
@@ -130,40 +132,42 @@ bool testEntry() {
     return true;
 }
 
-string emptyFeed("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-        "<rss version=\"2.0\">"
-        "<channel>"
-        "<title>Feed</title>"
-        "<link>1234</link>"
-        "<description>Feed</description>"
-        "</channel>"
+const string emptyFeed("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        "<rss version=\"2.0\">\n"
+        " <channel>\n"
+        "  <title>Feed</title>\n"
+        "  <link>1234</link>\n"
+        "  <description>Feed</description>\n"
+        " </channel>\n"
         "</rss>\n");
 
-string itemFeed("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-        "<rss version=\"2.0\">"
-        "<channel>"
-        "<title>Feed</title>"
-        "<link>1234</link>"
-        "<description>Feed</description>"
-        "<item>"
-        "<title>fruit</title>"
-        "<link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</link>"
-        "<description>"
-        "<item>"
-        "<name>Apple</name><price>$2.99</price>"
-        "</item>"
-        "</description>"
-        "</item>"
-        "<item>"
-        "<title>fruit</title>"
-        "<link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83c</link>"
-        "<description>"
-        "<item>"
-        "<name>Orange</name><price>$3.55</price>"
-        "</item>"
-        "</description>"
-        "</item>"
-        "</channel>"
+const string itemFeed("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        "<rss version=\"2.0\">\n"
+        " <channel>\n"
+        "  <title>Feed</title>\n"
+        "  <link>1234</link>\n"
+        "  <description>Feed</description>\n"
+        "  <item>\n"
+        "   <title>fruit</title>\n"
+        "   <link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</link>\n"
+        "   <description>\n"
+        "    <item>\n"
+        "     <name>Apple</name>\n"
+        "     <price>$2.99</price>\n"
+        "    </item>\n"
+        "   </description>\n"
+        "  </item>\n"
+        "  <item>\n"
+        "   <title>fruit</title>\n"
+        "   <link>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83c</link>\n"
+        "   <description>\n"
+        "    <item>\n"
+        "     <name>Orange</name>\n"
+        "     <price>$3.55</price>\n"
+        "    </item>\n"
+        "   </description>\n"
+        "  </item>\n"
+        " </channel>\n"
         "</rss>\n");
 
 bool testFeed() {