Author: robbinspg
Date: Wed Sep 27 09:23:18 2006
New Revision: 450497
URL: http://svn.apache.org/viewvc?view=rev&rev=450497
Log:
TUSCANY-705 Apply Geoff Winn's patch
merged with latest version
Added:
incubator/tuscany/cpp/sdo/runtime/core/test/jira705.xsd (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/jira705_out.txt (with props)
Modified:
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.opt
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/projects/tuscany_sdo/tuscany_sdo.ncb
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.ncb?view=diff&rev=450497&r1=450496&r2=450497
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.opt
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.opt?view=diff&rev=450497&r1=450496&r2=450497
==============================================================================
Binary files - no diff available.
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=450497&r1=450496&r2=450497
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
(original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp Wed
Sep 27 09:23:18 2006
@@ -1118,16 +1118,16 @@
{
if (dataObject->isNull(pl[i]))
{
- rc = xmlTextWriterStartElement(writer,
propertyName);
+ rc =
xmlTextWriterStartElementNS(writer, NULL, propertyName, NULL);
if (rc < 0)
{
SDO_THROW_EXCEPTION("writeDO",
- SDOXMLParserException,
- "xmlTextWriterStartElement
failed");
+
SDOXMLParserException,
+
"xmlTextWriterStartElementNS failed");
}
rc =
xmlTextWriterWriteAttribute(writer,
- (const unsigned char*)"xsi:nil",
- (const unsigned char*)"true");
+
(const unsigned char*)"xsi:nil",
+
(const unsigned char*)"true");
writeXmlnsXsi();
rc = xmlTextWriterEndElement(writer);
Added: incubator/tuscany/cpp/sdo/runtime/core/test/jira705.xsd
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/jira705.xsd?view=auto&rev=450497
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/jira705.xsd (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/jira705.xsd Wed Sep 27 09:23:18
2006
@@ -0,0 +1,11 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ targetNamespace="http://ConvertedStockQuote";>
+ <xs:element name="getQuote">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="ticker1" type="xs:string" nillable="true"/>
+ <xs:element name="ticker2" type="xs:string" nillable="true"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/jira705.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/jira705.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/jira705_out.txt
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/jira705_out.txt?view=auto&rev=450497
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/jira705_out.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/jira705_out.txt Wed Sep 27
09:23:18 2006
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<getQuote xmlns="http://ConvertedStockQuote";
xmlns:tns="http://ConvertedStockQuote";>
+ <ticker1>IBM</ticker1>
+ <ticker2 xsi:nil="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+</getQuote>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/jira705_out.txt
------------------------------------------------------------------------------
svn:eol-style = native
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=450497&r1=450496&r2=450497
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp Wed Sep 27 09:23:18
2006
@@ -168,6 +168,7 @@
TEST ( sdotest::b46613() );
TEST ( sdotest::b45933() );
TEST ( sdotest::jira490() );
+ TEST ( sdotest::jira705() );
cout << "Total tests:" << totaltests << " Tests passed:" << testspassed <<
endl;
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=450497&r1=450496&r2=450497
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp Wed Sep 27 09:23:18
2006
@@ -2877,6 +2877,49 @@
}
}
+int sdotest::jira705()
+{
+
+ char* retval = NULL;
+
+ try
+ {
+ DataFactoryPtr dataFactoryPtr = DataFactory::getDataFactory();
+ XSDHelperPtr xsdHelperPtr = HelperProvider::getXSDHelper((DataFactory
*)dataFactoryPtr);
+ XMLHelperPtr xmlHelperPtr = HelperProvider::getXMLHelper((DataFactory
*)dataFactoryPtr);
+ xsdHelperPtr->defineFile("jira705.xsd");
+
+ DataObjectPtr dataObjectPtr =
dataFactoryPtr->create("http://ConvertedStockQuote";, "getQuote");
+
+ dataObjectPtr->setCString("ticker1", "IBM");
+ dataObjectPtr->setNull("ticker2");
+
+ XMLDocumentPtr xmlDocumentPtr =
xmlHelperPtr->createDocument(dataObjectPtr, 0, "getQuote");
+
+ retval = xmlHelperPtr->save(xmlDocumentPtr, 2);
+
+ }
+ catch (SDORuntimeException e)
+ {
+ if (!silent) cout << "jira705 test failed" << endl;
+ return 0;
+ }
+
+ FILE *outfile = fopen("jira705_out.xml","w+");
+ if (outfile == 0)
+ {
+ if (!silent) cout << "Unable to open jira705_out.xml" << endl;
+ return 0;
+ }
+
+ fprintf(outfile, "%s", retval);
+
+ fclose(outfile);
+
+ return comparefiles("jira705_out.xml", "jira705_out.txt");
+
+}
+
int sdotest::jira490()
{
@@ -8881,8 +8924,3 @@
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=450497&r1=450496&r2=450497
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h Wed Sep 27 09:23:18
2006
@@ -170,6 +170,7 @@
static int testGetter(DataObjectPtr dor, char* str);
static int maintest();
static int jira490();
+ static int jira705();
static int b48602();
static int b48736();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
