Author: robbinspg
Date: Wed Jul 25 09:24:44 2007
New Revision: 559514
URL: http://svn.apache.org/viewvc?view=rev&rev=559514
Log:
TUSCANY-1478 - apply Michael Yoder's patch to branch
Added:
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/qualified.xml
(with props)
Modified:
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/main.cpp
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/sdotest.cpp
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/sdotest.h
Modified:
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp?view=diff&rev=559514&r1=559513&r2=559514
==============================================================================
---
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
(original)
+++
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
Wed Jul 25 09:24:44 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/branches/sdo-cpp-pre2.1/runtime/core/test/main.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/main.cpp?view=diff&rev=559514&r1=559513&r2=559514
==============================================================================
--- incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/main.cpp
(original)
+++ incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/main.cpp Wed
Jul 25 09:24:44 2007
@@ -188,6 +188,7 @@
TEST ( sdotest::loadWithoutSchema() );
//TEST ( sdotest::jira445() );
TEST ( sdotest::jira1112() );
+ TEST ( sdotest::elementFormDefaultQualified() );
} catch(...)
Added: incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/qualified.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/qualified.xml?view=auto&rev=559514
==============================================================================
--- incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/qualified.xml
(added)
+++ incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/qualified.xml
Wed Jul 25 09:24:44 2007
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:GetQuotes xmlns:tns="http://swanandmokashi.com";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><tns:QuoteTicker>IBM</tns:QuoteTicker></tns:GetQuotes>
Propchange:
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/qualified.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/qualified.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/sdotest.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/sdotest.cpp?view=diff&rev=559514&r1=559513&r2=559514
==============================================================================
--- incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/sdotest.cpp
(original)
+++ incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/sdotest.cpp Wed
Jul 25 09:24:44 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/branches/sdo-cpp-pre2.1/runtime/core/test/sdotest.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/sdotest.h?view=diff&rev=559514&r1=559513&r2=559514
==============================================================================
--- incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/sdotest.h
(original)
+++ incubator/tuscany/branches/sdo-cpp-pre2.1/runtime/core/test/sdotest.h Wed
Jul 25 09:24:44 2007
@@ -212,4 +212,5 @@
static int loadWithoutSchema();
static int jira445();
static int jira1112();
+ static int elementFormDefaultQualified();
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
