You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/07/25 18:09:50 UTC

svn commit: r559507 - in /incubator/tuscany/cpp/sdo/runtime/core: src/commonj/sdo/SDOXMLWriter.cpp test/main.cpp test/sdotest.cpp test/sdotest.h

Author: robbinspg
Date: Wed Jul 25 09:09:49 2007
New Revision: 559507

URL: http://svn.apache.org/viewvc?view=rev&rev=559507
Log:
TUSCANY-1478 - apply Michael Yoder's patch

Modified:
    incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
    incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp
    incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp
    incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h

Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp?view=diff&rev=559507&r1=559506&r2=559507
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp Wed Jul 25 09:09:49 2007
@@ -1133,7 +1133,7 @@
                                 if (!propertyTypeURI.isNull() 
                                     && !propertyTypeURI.equals("")
                                     && !propertyTypeURI.equals(s_commonjsdo)
-                                    && !propertyTypeURI.equals(tnsURI))
+                                    /* && !propertyTypeURI.equals(tnsURI) */)
                                 {
                                     // Locate the namespace prefix
                                     std::map<SDOXMLString,SDOXMLString>::iterator it = namespaceMap.find(propertyTypeURI);

Modified: incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp?view=diff&rev=559507&r1=559506&r2=559507
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp Wed Jul 25 09:09:49 2007
@@ -188,6 +188,7 @@
     TEST ( sdotest::loadWithoutSchema() );
     //TEST (  sdotest::jira445() );
     TEST (  sdotest::jira1112() );
+    TEST (  sdotest::elementFormDefaultQualified() );
 
 
     } catch(...)

Modified: incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp?view=diff&rev=559507&r1=559506&r2=559507
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp Wed Jul 25 09:09:49 2007
@@ -9287,3 +9287,36 @@
       return 0;
    }
 }
+
+int sdotest::elementFormDefaultQualified()
+{
+    try {
+        DataFactoryPtr mdg  = DataFactory::getDataFactory();
+        XSDHelperPtr xsh = HelperProvider::getXSDHelper(mdg);
+        xsh->defineFile("StockQuoteService.wsdl");
+
+        DataObjectPtr doObj = mdg->create("http://swanandmokashi.com",
+                                          "GetQuotes");
+
+        doObj->setCString("QuoteTicker", "IBM");
+        XMLHelperPtr xmlHelper = HelperProvider::getXMLHelper(mdg);
+
+
+        XMLDocumentPtr doc = 
+          xmlHelper->createDocument(doObj,
+                                    "http://swanandmokashi.com",
+                                    "GetQuotes");
+
+        xmlHelper->save(doc, "qualified-testout.xml");
+
+      return comparefiles("qualified.xml", "qualified-testout.xml");
+    }
+    catch (SDORuntimeException e) {
+        cout << "sdotest::elementFormDefaultQualified() failed" << endl << e << endl;
+        return 0;
+    }
+    return 0;
+}
+
+
+

Modified: incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h?view=diff&rev=559507&r1=559506&r2=559507
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h Wed Jul 25 09:09:49 2007
@@ -211,4 +211,5 @@
         static int loadWithoutSchema();
         static int jira445();
         static int jira1112();
+        static int elementFormDefaultQualified();
 };



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org