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/09 17:27:41 UTC
svn commit: r554683 - in /incubator/tuscany/cpp/sdo/runtime/core:
src/commonj/sdo/ test/
Author: robbinspg
Date: Mon Jul 9 08:27:39 2007
New Revision: 554683
URL: http://svn.apache.org/viewvc?view=rev&rev=554683
Log:
TUSCANY-1112 Do not write the default namespace (fix in HEAD)
Modified:
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
incubator/tuscany/cpp/sdo/runtime/core/test/b46634_out.txt
incubator/tuscany/cpp/sdo/runtime/core/test/bug45933-output.txt
incubator/tuscany/cpp/sdo/runtime/core/test/bunique-outxml.txt
incubator/tuscany/cpp/sdo/runtime/core/test/buniqueread-out.txt
incubator/tuscany/cpp/sdo/runtime/core/test/cdata-out.xml
incubator/tuscany/cpp/sdo/runtime/core/test/clone-out-win.xml
incubator/tuscany/cpp/sdo/runtime/core/test/clone-out.xml
incubator/tuscany/cpp/sdo/runtime/core/test/csload-output.txt
incubator/tuscany/cpp/sdo/runtime/core/test/csload2-output.txt
incubator/tuscany/cpp/sdo/runtime/core/test/csload3-output.txt
incubator/tuscany/cpp/sdo/runtime/core/test/cssave-output.txt
incubator/tuscany/cpp/sdo/runtime/core/test/cssave2-output.txt
incubator/tuscany/cpp/sdo/runtime/core/test/emptycs1.txt
incubator/tuscany/cpp/sdo/runtime/core/test/emptycs2.txt
incubator/tuscany/cpp/sdo/runtime/core/test/emptycs3.txt
incubator/tuscany/cpp/sdo/runtime/core/test/jira1112expected.xml
incubator/tuscany/cpp/sdo/runtime/core/test/jira705_out.txt
incubator/tuscany/cpp/sdo/runtime/core/test/loadload-output.txt
incubator/tuscany/cpp/sdo/runtime/core/test/merle1.txt
incubator/tuscany/cpp/sdo/runtime/core/test/openloadNSout.txt
incubator/tuscany/cpp/sdo/runtime/core/test/saveopen-output.txt
incubator/tuscany/cpp/sdo/runtime/core/test/tuscany963.out.xml.txt
incubator/tuscany/cpp/sdo/runtime/core/test/types.xsd
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=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp Mon Jul 9 08:27:39 2007
@@ -131,13 +131,6 @@
// For the root DataObject we need to determine the element name
SDOXMLString elementURI = doc->getRootElementURI();
- if (elementURI.isNull() || elementURI.equals(""))
- {
- if (!rootTypeURI.equals(s_commonjsdo))
- {
- elementURI = rootTypeURI;
- }
- }
SDOXMLString elementName = doc->getRootElementName();
if (elementName.isNull() || elementName.equals(""))
{
@@ -705,6 +698,15 @@
// First we need to write the startElement
if (isRoot)
{
+ // For the root element we will now gather all the namespace information
+ addNamespace(elementURI, true);
+
+ // We always add the xsi namespace. TODO we should omit if we can
+ namespaceMap[s_xsiNS] = s_xsi;
+
+ DataObjectImpl* d = (DataObjectImpl*)(DataObject*)dataObject;
+ addToNamespaces(d);
+
if (elementURI.equals(s_commonjsdo))
{
tnsURI = "";
@@ -713,54 +715,32 @@
{
tnsURI = elementURI;
}
+ }
+ // Write the startElement for non-root object
+ SDOXMLString theName=elementName;
- if (tnsURI.equals("")) {
- rc = xmlTextWriterStartElementNS(writer, NULL, elementName, NULL);
- }
- else
+ // If an elementURI is specified then the elementForm is "qualified"
+ if (!elementURI.isNull()
+ && !elementURI.equals("")
+ && !elementURI.equals(s_commonjsdo)
+ //&& !elementURI.equals(tnsURI)
+ )
+ {
+ // Locate the namespace prefix
+ std::map<SDOXMLString,SDOXMLString>::iterator it = namespaceMap.find(elementURI);
+ if (it != namespaceMap.end())
{
- rc = xmlTextWriterStartElementNS(writer, NULL, elementName, elementURI);
+ theName = (*it).second;
+ theName += ":";
+ theName += elementName;
}
- if (rc < 0) {
- SDO_THROW_EXCEPTION("writeDO", SDOXMLParserException, "xmlTextWriterStartElementNS failed");
- }
-
- // For the root element we will now gather all the namespace information
- addNamespace(elementURI, true);
-
- // We always add the xsi namespace. TODO we should omit if we can
- namespaceMap[s_xsiNS] = s_xsi;
-
- DataObjectImpl* d = (DataObjectImpl*)(DataObject*)dataObject;
- addToNamespaces(d);
}
- else
- {
- // Write the startElement for non-root object
- SDOXMLString theName=elementName;
- // If an elementURI is specified then the elementForm is "qualified"
- if (!elementURI.isNull()
- && !elementURI.equals("")
- && !elementURI.equals(s_commonjsdo)
- //&& !elementURI.equals(tnsURI)
- )
- {
- // Locate the namespace prefix
- std::map<SDOXMLString,SDOXMLString>::iterator it = namespaceMap.find(elementURI);
- if (it != namespaceMap.end())
- {
- theName = (*it).second;
- theName += ":";
- theName += elementName;
- }
- }
+ rc = xmlTextWriterStartElement(writer, theName);
+ if (rc < 0) {
+ SDO_THROW_EXCEPTION("writeDO", SDOXMLParserException, "xmlTextWriterStartElement failed");
+ }
- rc = xmlTextWriterStartElement(writer, theName);
- if (rc < 0) {
- SDO_THROW_EXCEPTION("writeDO", SDOXMLParserException, "xmlTextWriterStartElement failed");
- }
- }
// End - startElement is written
// -----------------------------
@@ -802,7 +782,7 @@
{
SDOXMLString theName=typeName;
- if (!typeURI.isNull() && !typeURI.equals(tnsURI) && !typeURI.equals(""))
+ if (!typeURI.isNull() && !typeURI.equals(""))
{
std::map<SDOXMLString,SDOXMLString>::iterator it = namespaceMap.find(typeURI);
if (it != namespaceMap.end())
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/b46634_out.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/b46634_out.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/b46634_out.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/b46634_out.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp"><departments name="Advanced Technologies" location="NY" number="123"><employees><name>Jane Doe</name><SN xsi:nil="true"/></employees></departments></company>
+<company xsi:type="tns2:CompanyType" xmlns:tns2="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp"><departments name="Advanced Technologies" location="NY" number="123"><employees><name>Jane Doe</name><SN xsi:nil="true"/></employees></departments></company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/bug45933-output.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/bug45933-output.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/bug45933-output.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/bug45933-output.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xsi:type="CompanyType" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Bug45933"><sdo:changeSummary xmlns:sdo="commonj.sdo"><company sdo:ref="#/"><bools>false</bools></company></sdo:changeSummary></company>
+<tns:company xsi:type="tns:CompanyType" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Bug45933"><sdo:changeSummary xmlns:sdo="commonj.sdo"><company sdo:ref="#/"><bools>false</bools></company></sdo:changeSummary></tns:company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/bunique-outxml.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/bunique-outxml.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/bunique-outxml.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/bunique-outxml.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<rooty xmlns="test" xsi:type="Root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns2="nottest" xmlns:tns="test"><duplicate id="1"><ob/></duplicate><duplicate2 id="3"/><unique id="5"><ob/></unique><duplicatelist id="2"><ob/></duplicatelist><duplicatelist2 id="4"/><uniquelist id="6"/></rooty>
+<rooty xsi:type="tns2:Root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns3="nottest" xmlns:tns2="test"><duplicate id="1"><ob/></duplicate><duplicate2 id="3"/><unique id="5"><ob/></unique><duplicatelist id="2"><ob/></duplicatelist><duplicatelist2 id="4"/><uniquelist id="6"/></rooty>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/buniqueread-out.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/buniqueread-out.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/buniqueread-out.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/buniqueread-out.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<rooty xmlns="test" xsi:type="Root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns2="nottest" xmlns:tns="test"><duplicate id="1"><ob/></duplicate><duplicate2 id="3"/><unique id="5"><ob/></unique><duplicatelist id="2"><ob/></duplicatelist><duplicatelist2 id="4"/><uniquelist id="6"/></rooty>
+<rooty xsi:type="tns2:Root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns3="nottest" xmlns:tns2="test"><duplicate id="1"><ob/></duplicate><duplicate2 id="3"/><unique id="5"><ob/></unique><duplicatelist id="2"><ob/></duplicatelist><duplicatelist2 id="4"/><uniquelist id="6"/></rooty>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/cdata-out.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/cdata-out.xml?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/cdata-out.xml (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/cdata-out.xml Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<test xmlns="http://www.example.org/test" xmlns:tns="http://www.example.org/test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><entry1><data>xxx<![CDATA[<?xml version="1.0"encoding="UTF-8"?><MOREXML>....</MOREXML>]]>aaaa<![CDATA[>>>>>>>>>]]></data><fred>abcdefg</fred><fred><![CDATA[>>>>>>>>>]]></fred><fred>xxx<![CDATA[<?xml version="1.0"encoding="UTF-8"?><MOREXML>....</MOREXML>]]>aaaa<![CDATA[>>>>>>>>>]]></fred><jim>xxx<![CDATA[<?xml version="1.0"encoding="UTF-8"?><MOREXML>....</MOREXML>]]>aaaa<![CDATA[>>>>>>>>>]]></jim></entry1></test>
+<tns:test xmlns:tns="http://www.example.org/test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><entry1><data>xxx<![CDATA[<?xml version="1.0"encoding="UTF-8"?><MOREXML>....</MOREXML>]]>aaaa<![CDATA[>>>>>>>>>]]></data><fred>abcdefg</fred><fred><![CDATA[>>>>>>>>>]]></fred><fred>xxx<![CDATA[<?xml version="1.0"encoding="UTF-8"?><MOREXML>....</MOREXML>]]>aaaa<![CDATA[>>>>>>>>>]]></fred><jim>xxx<![CDATA[<?xml version="1.0"encoding="UTF-8"?><MOREXML>....</MOREXML>]]>aaaa<![CDATA[>>>>>>>>>]]></jim></entry1></tns:test>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/clone-out-win.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/clone-out-win.xml?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/clone-out-win.xml (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/clone-out-win.xml Mon Jul 9 08:27:39 2007
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Clone xmlns="http://www.example.org/test" xmlns:tns="http://www.example.org/test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<tns:Clone xmlns:tns="http://www.example.org/test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
abc
<test>test</test>
def
<tests>test</tests>
<tests>tests again</tests>
- ghi</Clone>
+ ghi</tns:Clone>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/clone-out.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/clone-out.xml?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/clone-out.xml (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/clone-out.xml Mon Jul 9 08:27:39 2007
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Clone xmlns="http://www.example.org/test" xmlns:tns="http://www.example.org/test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<tns:Clone xmlns:tns="http://www.example.org/test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
abc
<test>test</test>
def
<tests>test</tests>
<tests>tests again</tests>
ghi
-</Clone>
+</tns:Clone>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/csload-output.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/csload-output.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/csload-output.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/csload-output.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp" employeeOfTheMonth="E0004"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"><create>#/departments.0/employees.2</create><delete>#/departments.0/employees.1</delete><create>#/departments.0/employees.3</create><create>#/departments.0/employees.4</create><company sdo:ref="#/" employeeOfTheMonth="" name="ACME" employeeOfTheMonth="#/departments.0/employees.1"/><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees name="Mary Smith" SN="E0002" manager="true"/><employees sdo:ref="#/departments.0/employees.1"/></departments></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="John Jones" SN="E0001"/><employees name="Jane Doe" SN="E0003"/><employees name="Al Smith" SN="E0004" manager="true"/><employees name="Bill Withers" SN="E0005"/><employees name="Mary Smith"
SN="E0002" manager="true"/></departments></company>
+<company xsi:type="tns2:CompanyType" xmlns:tns2="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp" employeeOfTheMonth="E0004"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"><create>#/departments.0/employees.2</create><delete>#/departments.0/employees.1</delete><create>#/departments.0/employees.3</create><create>#/departments.0/employees.4</create><company sdo:ref="#/" employeeOfTheMonth="" name="ACME" employeeOfTheMonth="#/departments.0/employees.1"/><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees name="Mary Smith" SN="E0002" manager="true"/><employees sdo:ref="#/departments.0/employees.1"/></departments></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="John Jones" SN="E0001"/><employees name="Jane Doe" SN="E0003"/><employees name="Al Smith" SN="E0004" manager="true"/><employees name="Bill Withers" SN="E0005"/><employees name="
Mary Smith" SN="E0002" manager="true"/></departments></company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/csload2-output.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/csload2-output.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/csload2-output.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/csload2-output.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp" employeeOfTheMonth="E0005"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.1/employees.4</delete><delete>#/departments.1/employees.3</delete><delete>#/departments.1/employees.2</delete><delete>#/departments.1/employees.1</delete><delete>#/departments.1/employees.0</delete><delete>#/departments.1</delete><create>#/departments.0/employees.2</create><company sdo:ref="#/" employeeOfTheMonth="" name="Eastleigh Borough Council"><departments sdo:ref="#/departments.0"/><departments name="Tax Collection" location="Winchester" number="666"><employees name="Arch Meanie" SN="D0001" manager="false"/><employees name="Boris the Spider" SN="D0002" manager="true"/><employees name="Cash Hoarder" SN="D0003" manager=
"false"/><employees name="Dean Giyatoss" SN="D0004" manager="false"/><employees name="Ebenezer Scrooge" SN="D0005" manager="false"/></departments></company><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees name="Bridget Jones" SN="E0002" manager="true"/><employees name="Colin Thorne" SN="E0003" manager="false"/><employees name="Donald Trump" SN="E0004" manager="false"/><employees sdo:ref="#/departments.0/employees.1"/></departments></sdo:changeSummary><departments name="Waste Disposal" location="Botley" number="123"><employees name="Alphonse Dodet" SN="E0001"/><employees name="Eddy the eagle" SN="E0005"/><employees name="Colin Thorne" SN="E0003"/></departments></company>
+<company xsi:type="tns2:CompanyType" xmlns:tns2="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp" employeeOfTheMonth="E0005"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.1/employees.4</delete><delete>#/departments.1/employees.3</delete><delete>#/departments.1/employees.2</delete><delete>#/departments.1/employees.1</delete><delete>#/departments.1/employees.0</delete><delete>#/departments.1</delete><create>#/departments.0/employees.2</create><company sdo:ref="#/" employeeOfTheMonth="" name="Eastleigh Borough Council"><departments sdo:ref="#/departments.0"/><departments name="Tax Collection" location="Winchester" number="666"><employees name="Arch Meanie" SN="D0001" manager="false"/><employees name="Boris the Spider" SN="D0002" manager="true"/><employees name="Cash Hoarder" SN="D000
3" manager="false"/><employees name="Dean Giyatoss" SN="D0004" manager="false"/><employees name="Ebenezer Scrooge" SN="D0005" manager="false"/></departments></company><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees name="Bridget Jones" SN="E0002" manager="true"/><employees name="Colin Thorne" SN="E0003" manager="false"/><employees name="Donald Trump" SN="E0004" manager="false"/><employees sdo:ref="#/departments.0/employees.1"/></departments></sdo:changeSummary><departments name="Waste Disposal" location="Botley" number="123"><employees name="Alphonse Dodet" SN="E0001"/><employees name="Eddy the eagle" SN="E0005"/><employees name="Colin Thorne" SN="E0003"/></departments></company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/csload3-output.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/csload3-output.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/csload3-output.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/csload3-output.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp" employeeOfTheMonth="E0005"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.1/employees.4</delete><delete>#/departments.1/employees.3</delete><delete>#/departments.1/employees.2</delete><delete>#/departments.1/employees.1</delete><delete>#/departments.1/employees.0</delete><delete>#/departments.1</delete><create>#/departments.0/employees.2</create><company sdo:ref="#/" employeeOfTheMonth="" name="Eastleigh Borough Council"><departments sdo:ref="#/departments.0"/><departments name="Tax Collection" location="Winchester" number="666"><employees name="Arch Meanie" SN="D0001" manager="false"/><employees name="Boris the Spider" SN="D0002" manager="true"/><employees name="Cash Hoarder" SN="D0003" manager=
"false"/><employees name="Dean Giyatoss" SN="D0004" manager="false"/><employees name="Ebenezer Scrooge" SN="D0005" manager="false"/></departments></company><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees name="Bridget Jones" SN="E0002" manager="true"/><employees name="Colin Thorne" SN="E0003" manager="false"/><employees name="Donald Trump" SN="E0004" manager="false"/><employees sdo:ref="#/departments.0/employees.1"/></departments></sdo:changeSummary><departments name="Waste Disposal" location="Botley" number="123"><employees name="Alphonse Dodet" SN="E0001"/><employees name="Eddy the eagle" SN="E0005"/><employees name="Colin Thorne" SN="E0003"/></departments></company>
+<company xsi:type="tns2:CompanyType" xmlns:tns2="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp" employeeOfTheMonth="E0005"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.1/employees.4</delete><delete>#/departments.1/employees.3</delete><delete>#/departments.1/employees.2</delete><delete>#/departments.1/employees.1</delete><delete>#/departments.1/employees.0</delete><delete>#/departments.1</delete><create>#/departments.0/employees.2</create><company sdo:ref="#/" employeeOfTheMonth="" name="Eastleigh Borough Council"><departments sdo:ref="#/departments.0"/><departments name="Tax Collection" location="Winchester" number="666"><employees name="Arch Meanie" SN="D0001" manager="false"/><employees name="Boris the Spider" SN="D0002" manager="true"/><employees name="Cash Hoarder" SN="D000
3" manager="false"/><employees name="Dean Giyatoss" SN="D0004" manager="false"/><employees name="Ebenezer Scrooge" SN="D0005" manager="false"/></departments></company><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees name="Bridget Jones" SN="E0002" manager="true"/><employees name="Colin Thorne" SN="E0003" manager="false"/><employees name="Donald Trump" SN="E0004" manager="false"/><employees sdo:ref="#/departments.0/employees.1"/></departments></sdo:changeSummary><departments name="Waste Disposal" location="Botley" number="123"><employees name="Alphonse Dodet" SN="E0001"/><employees name="Eddy the eagle" SN="E0005"/><employees name="Colin Thorne" SN="E0003"/></departments></company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/cssave-output.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/cssave-output.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/cssave-output.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/cssave-output.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp" employeeOfTheMonth="E0004"><sdo:changeSummary xmlns:sdo="commonj.sdo"><create>#/departments.0/employees.2</create><delete>#/departments.0/employees.1</delete><create>#/departments.0/employees.3</create><create>#/departments.0/employees.4</create><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees name="Mary Smith" SN="E0002" manager="true"/><employees sdo:ref="#/departments.0/employees.1"/></departments><company sdo:ref="#/" name="ACME" employeeOfTheMonth="#/departments.0/employees.1"/></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="John Jones" SN="E0001"/><employees name="Jane Doe" SN="E0003"/><employees name="Al Smith" SN="E0004" manager="true"/><employees name="Bill Withers" SN="E0005"/><employees name="Mary Smith" SN="E0002" manager="true"/></departm
ents></company>
+<tns:company xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp" employeeOfTheMonth="E0004"><sdo:changeSummary xmlns:sdo="commonj.sdo"><create>#/departments.0/employees.2</create><delete>#/departments.0/employees.1</delete><create>#/departments.0/employees.3</create><create>#/departments.0/employees.4</create><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees name="Mary Smith" SN="E0002" manager="true"/><employees sdo:ref="#/departments.0/employees.1"/></departments><company sdo:ref="#/" name="ACME" employeeOfTheMonth="#/departments.0/employees.1"/></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="John Jones" SN="E0001"/><employees name="Jane Doe" SN="E0003"/><employees name="Al Smith" SN="E0004" manager="true"/><employees name="Bill Withers" SN="E0005"/><employees name="Mary Smith" SN="E0002" manager="true"/></departments></tns:com
pany>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/cssave2-output.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/cssave2-output.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/cssave2-output.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/cssave2-output.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp" employeeOfTheMonth="E0005"><sdo:changeSummary xmlns:sdo="commonj.sdo"><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.1/employees.4</delete><delete>#/departments.1/employees.3</delete><delete>#/departments.1/employees.2</delete><delete>#/departments.1/employees.1</delete><delete>#/departments.1/employees.0</delete><delete>#/departments.1</delete><create>#/departments.0/employees.2</create><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees name="Bridget Jones" SN="E0002" manager="true"/><employees name="Colin Thorne" SN="E0003" manager="false"/><employees name="Donald Trump" SN="E0004" manager="false"/><employees sdo:ref="#/departments.0/employees.1"/></departments><company sdo:ref="#/" name="Eastleigh Boro
ugh Council" employeeOfTheMonth=""><departments sdo:ref="#/departments.0"/><departments name="Tax Collection" location="Winchester" number="666"><employees name="Arch Meanie" SN="D0001" manager="false"/><employees name="Boris the Spider" SN="D0002" manager="true"/><employees name="Cash Hoarder" SN="D0003" manager="false"/><employees name="Dean Giyatoss" SN="D0004" manager="false"/><employees name="Ebenezer Scrooge" SN="D0005" manager="false"/></departments></company></sdo:changeSummary><departments name="Waste Disposal" location="Botley" number="123"><employees name="Alphonse Dodet" SN="E0001"/><employees name="Eddy the eagle" SN="E0005"/><employees name="Colin Thorne" SN="E0003"/></departments></company>
+<tns:company xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MegaCorp" employeeOfTheMonth="E0005"><sdo:changeSummary xmlns:sdo="commonj.sdo"><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.0/employees.1</delete><delete>#/departments.1/employees.4</delete><delete>#/departments.1/employees.3</delete><delete>#/departments.1/employees.2</delete><delete>#/departments.1/employees.1</delete><delete>#/departments.1/employees.0</delete><delete>#/departments.1</delete><create>#/departments.0/employees.2</create><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees name="Bridget Jones" SN="E0002" manager="true"/><employees name="Colin Thorne" SN="E0003" manager="false"/><employees name="Donald Trump" SN="E0004" manager="false"/><employees sdo:ref="#/departments.0/employees.1"/></departments><company sdo:ref="#/" name="Eastleigh Borough Council" e
mployeeOfTheMonth=""><departments sdo:ref="#/departments.0"/><departments name="Tax Collection" location="Winchester" number="666"><employees name="Arch Meanie" SN="D0001" manager="false"/><employees name="Boris the Spider" SN="D0002" manager="true"/><employees name="Cash Hoarder" SN="D0003" manager="false"/><employees name="Dean Giyatoss" SN="D0004" manager="false"/><employees name="Ebenezer Scrooge" SN="D0005" manager="false"/></departments></company></sdo:changeSummary><departments name="Waste Disposal" location="Botley" number="123"><employees name="Alphonse Dodet" SN="E0001"/><employees name="Eddy the eagle" SN="E0005"/><employees name="Colin Thorne" SN="E0003"/></departments></tns:company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/emptycs1.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/emptycs1.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/emptycs1.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/emptycs1.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME" employeeOfTheMonth="E0002"><sdo:changeSummary xmlns:sdo="commonj.sdo"/><departments name="Advanced Technologies" location="NY" number="123"><employees name="John Jones" SN="E0001"/><employees name="Mary Smith" SN="E0002" manager="true"/><employees name="Jane Doe" SN="E0003"/></departments></company>
+<tns:company xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME" employeeOfTheMonth="E0002"><sdo:changeSummary xmlns:sdo="commonj.sdo"/><departments name="Advanced Technologies" location="NY" number="123"><employees name="John Jones" SN="E0001"/><employees name="Mary Smith" SN="E0002" manager="true"/><employees name="Jane Doe" SN="E0003"/></departments></tns:company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/emptycs2.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/emptycs2.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/emptycs2.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/emptycs2.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME" employeeOfTheMonth="E0002"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"/><departments name="Advanced Technologies" location="NY" number="123"><employees name="John Jones" SN="E0001"/><employees name="Mary Smith" SN="E0002" manager="true"/><employees name="Jane Doe" SN="E0003"/></departments></company>
+<tns:company xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME" employeeOfTheMonth="E0002"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"/><departments name="Advanced Technologies" location="NY" number="123"><employees name="John Jones" SN="E0001"/><employees name="Mary Smith" SN="E0002" manager="true"/><employees name="Jane Doe" SN="E0003"/></departments></tns:company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/emptycs3.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/emptycs3.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/emptycs3.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/emptycs3.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME" employeeOfTheMonth="E0002"><sdo:changeSummary xmlns:sdo="commonj.sdo"><create>#/departments.0/employees.3</create><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees sdo:ref="#/departments.0/employees.1"/><employees sdo:ref="#/departments.0/employees.2"/></departments></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="John Jones" SN="E0001"/><employees name="Mary Smith" SN="E0002" manager="true"/><employees name="Jane Doe" SN="E0003"/><employees name="Al Smith" SN="E0004" manager="true"/></departments></company>
+<tns:company xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME" employeeOfTheMonth="E0002"><sdo:changeSummary xmlns:sdo="commonj.sdo"><create>#/departments.0/employees.3</create><departments sdo:ref="#/departments.0"><employees sdo:ref="#/departments.0/employees.0"/><employees sdo:ref="#/departments.0/employees.1"/><employees sdo:ref="#/departments.0/employees.2"/></departments></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="John Jones" SN="E0001"/><employees name="Mary Smith" SN="E0002" manager="true"/><employees name="Jane Doe" SN="E0003"/><employees name="Al Smith" SN="E0004" manager="true"/></departments></tns:company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/jira1112expected.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/jira1112expected.xml?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/jira1112expected.xml (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/jira1112expected.xml Mon Jul 9 08:27:39 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<BOGUS xmlns="http://Component" xsi:type="add" xmlns:tns="http://Component" xmlns:tns2="http://www.test.com/info" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<BOGUS xsi:type="tns2:add" xmlns:tns2="http://Component" xmlns:tns3="http://www.test.com/info" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<person>
<name>
<first>Will</first>
Modified: 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=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/jira705_out.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/jira705_out.txt Mon Jul 9 08:27:39 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<getQuote xmlns="http://ConvertedStockQuote" xmlns:tns="http://ConvertedStockQuote" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<getQuote xsi:type="tns2:getQuote" xmlns:tns2="http://ConvertedStockQuote" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ticker1>IBM</ticker1>
<ticker2 xsi:nil="true"/>
</getQuote>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/loadload-output.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/loadload-output.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/loadload-output.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/loadload-output.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xsi:type="CompanyType" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"><create>#/departments.0/employees.0/opendataobjectlist.0</create><create>#/departments.0/employees.0/opendataobject</create><create>#/departments.0/employees.0</create></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="Albert" SN="E0001" openstring="Value Of Open String" openboolean="true"><openintlist>45</openintlist><tns:opendataobjectlist name="MyOpenName"/><tns:opendataobject name="MyOpenName"/></employees><employees name="Boris" SN="E0002" manager="true"/><employees name="Carl" SN="E0003"/></departments></company>
+<company xsi:type="tns2:CompanyType" xmlns:tns2="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"><create>#/departments.0/employees.0/opendataobjectlist.0</create><create>#/departments.0/employees.0/opendataobject</create><create>#/departments.0/employees.0</create></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="Albert" SN="E0001" openstring="Value Of Open String" openboolean="true"><openintlist>45</openintlist><tns2:opendataobjectlist name="MyOpenName"/><tns2:opendataobject name="MyOpenName"/></employees><employees name="Boris" SN="E0002" manager="true"/><employees name="Carl" SN="E0003"/></departments></company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/merle1.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/merle1.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/merle1.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/merle1.txt Mon Jul 9 08:27:39 2007
@@ -3,8 +3,8 @@
<XMLEscaping>I am the XML escaping string</XMLEscaping>
<Validate>I am the Validate string</Validate>
DataObject "Shared" as XML:
-<Shared xmlns="axis" xsi:type="ItemSearchRequest" xmlns:tns="axis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><Keywords>SharedKeywordsString</Keywords><SearchIndex>SearchIndexString</SearchIndex></Shared>
+<tns:Shared xsi:type="tns:ItemSearchRequest" xmlns:tns="axis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><Keywords>SharedKeywordsString</Keywords><SearchIndex>SearchIndexString</SearchIndex></tns:Shared>
DataObject "Request" as XML:
-<Request xmlns="axis" xsi:type="ItemSearchRequest" xmlns:tns="axis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><Keywords>RequestKeywords</Keywords><SearchIndex>RequestSearchIndex</SearchIndex></Request>
+<tns:Request xsi:type="tns:ItemSearchRequest" xmlns:tns="axis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><Keywords>RequestKeywords</Keywords><SearchIndex>RequestSearchIndex</SearchIndex></tns:Request>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/openloadNSout.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/openloadNSout.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/openloadNSout.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/openloadNSout.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xsi:type="CompanyType" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"><create>#/departments.0/employees.0</create></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="Albert" SN="E0001" openstring="Value Of Open String" openboolean="true"><openintlist>45</openintlist></employees><employees name="Boris" SN="E0002" manager="true"/><employees name="Carl" SN="E0003"/></departments></company>
+<company xsi:type="tns2:CompanyType" xmlns:tns2="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME"><sdo:changeSummary xmlns:sdo="commonj.sdo" logging="true"><create>#/departments.0/employees.0</create></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="Albert" SN="E0001" openstring="Value Of Open String" openboolean="true"><openintlist>45</openintlist></employees><employees name="Boris" SN="E0002" manager="true"/><employees name="Carl" SN="E0003"/></departments></company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/saveopen-output.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/saveopen-output.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/saveopen-output.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/saveopen-output.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<company xmlns="companyNS" xsi:type="CompanyType" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME"><sdo:changeSummary xmlns:sdo="commonj.sdo"><create>#/departments.0/employees.0</create><create>#/departments.0/employees.1</create><create>#/departments.0/employees.2</create><create>#/departments.0/employees.0/opendataobjectlist.0</create><departments sdo:ref="#/departments.0" name="" location="" number=""/></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="Albert" SN="E0001" openstring="Value Of Open String" openboolean="true"><openintlist>45</openintlist><opendataobjectlist xsi:type="OpenType" name="MyOpenName"/><opendataobject xsi:type="OpenType" name="MyOpenName"/></employees><employees name="Boris" SN="E0002" manager="true"/><employees name="Carl" SN="E0003"/></departments></company>
+<tns:company xsi:type="tns:CompanyType" xmlns:tns="companyNS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ACME"><sdo:changeSummary xmlns:sdo="commonj.sdo"><create>#/departments.0/employees.0</create><create>#/departments.0/employees.1</create><create>#/departments.0/employees.2</create><create>#/departments.0/employees.0/opendataobjectlist.0</create><departments sdo:ref="#/departments.0" name="" location="" number=""/></sdo:changeSummary><departments name="Advanced Technologies" location="NY" number="123"><employees name="Albert" SN="E0001" openstring="Value Of Open String" openboolean="true"><openintlist>45</openintlist><opendataobjectlist xsi:type="tns:OpenType" name="MyOpenName"/><opendataobject xsi:type="tns:OpenType" name="MyOpenName"/></employees><employees name="Boris" SN="E0002" manager="true"/><employees name="Carl" SN="E0003"/></departments></tns:company>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/tuscany963.out.xml.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/tuscany963.out.xml.txt?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/tuscany963.out.xml.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/tuscany963.out.xml.txt Mon Jul 9 08:27:39 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<content xmlns="http://www.w3.org/2005/Atom" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://www.w3.org/2005/Atom" base="blah" lang="blah2"/>
+<tns:content xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://www.w3.org/2005/Atom" base="blah" lang="blah2"/>
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/types.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/types.xsd?view=diff&rev=554683&r1=554682&r2=554683
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/types.xsd (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/types.xsd Mon Jul 9 08:27:39 2007
@@ -19,8 +19,7 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:ns0="http://www.test.com/info"
- targetNamespace="http://Component"
- elementNameDefault="qualified">
+ targetNamespace="http://Component">
<xs:import schemaLocation="person.xsd"
namespace="http://www.test.com/info"/>
<xs:element name="add">
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org