You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ed...@apache.org on 2006/05/26 13:01:23 UTC
svn commit: r409639 - /incubator/tuscany/cpp/sdo/runtime/core/test/
Author: edslattery
Date: Fri May 26 04:01:22 2006
New Revision: 409639
URL: http://svn.apache.org/viewvc?rev=409639&view=rev
Log: (empty)
Added:
incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xml.txt (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xsd.txt (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups.xsd (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups_xsd.txt (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename.xsd (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename_xsd.txt (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup.xsd (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup_xsd.txt (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup.xsd (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup_xsd.txt (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate.xsd (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate_xsd.txt (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix.xsd (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix_xsd.txt (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/groupwrongname.xsd (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/list1.xml (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/list1.xsd (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/list1_xml.txt (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/list1_xsd.txt (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/pete.xml (with props)
incubator/tuscany/cpp/sdo/runtime/core/test/pete.xsd (with props)
Modified:
incubator/tuscany/cpp/sdo/runtime/core/test/b48636.xsd
incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp
incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h
incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp
incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/b48636.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/b48636.xsd?rev=409639&r1=409638&r2=409639&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/b48636.xsd (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/b48636.xsd Fri May 26 04:01:22 2006
@@ -10,7 +10,7 @@
</group>
<element name="name">
<complexType>
- <group ref="target:NameGroup"/>
+ <group ref="NameGroup"/>
<attribute name="title" type="string"/>
</complexType>
</element>
Added: incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xml.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xml.txt?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xml.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xml.txt Fri May 26 04:01:22 2006
@@ -0,0 +1,36 @@
+***** TYPES AFTER RESOLVE*********************************
+Type:commonj.sdo#BigDecimal
+Type:commonj.sdo#BigInteger
+Type:commonj.sdo#Boolean
+Type:commonj.sdo#Byte
+Type:commonj.sdo#Bytes
+Type:commonj.sdo#ChangeSummary
+Type:commonj.sdo#Character
+Type:commonj.sdo#DataObject
+Type:commonj.sdo#Date
+Type:commonj.sdo#Double
+Type:commonj.sdo#Float
+Type:commonj.sdo#Integer
+Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
+Type:commonj.sdo#Short
+Type:commonj.sdo#String
+Type:commonj.sdo#URI
+Type:http://www.wrox.com/name#RootType
+Property:name of type name
+Type:http://www.wrox.com/name#name
+Property:first of type String
+Property:middle of type String
+Property:last of type String
+Property:title of type String
+*******************************END TYPES******************
+===== DataObject contents =====
+first:string:John
+
+middle:string:Fitzgerald
+
+last:string:Doe
+
+title:string:Mr.
+
+===== End DataObject =====
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xml.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xsd.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xsd.txt?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xsd.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xsd.txt Fri May 26 04:01:22 2006
@@ -0,0 +1,26 @@
+***** TYPES BEFORE RESOLVE **********************************
+Type:commonj.sdo#BigDecimal
+Type:commonj.sdo#BigInteger
+Type:commonj.sdo#Boolean
+Type:commonj.sdo#Byte
+Type:commonj.sdo#Bytes
+Type:commonj.sdo#ChangeSummary
+Type:commonj.sdo#Character
+Type:commonj.sdo#DataObject
+Type:commonj.sdo#Date
+Type:commonj.sdo#Double
+Type:commonj.sdo#Float
+Type:commonj.sdo#Integer
+Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
+Type:commonj.sdo#Short
+Type:commonj.sdo#String
+Type:commonj.sdo#URI
+Type:http://www.wrox.com/name#RootType
+Property:name of type name
+Type:http://www.wrox.com/name#name
+Property:first of type String
+Property:middle of type String
+Property:last of type String
+Property:title of type String
+*******************************END TYPES******************
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/b48636_xsd.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups.xsd?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups.xsd (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups.xsd Fri May 26 04:01:22 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.wrox.com/name"
+xmlns:target="http://www.wrox.com/name" elementFormDefault="qualified">
+ <group name="NameGroup">
+ <sequence>
+ <element name="first" type="string"/>
+ <element name="middle" type="string"/>
+ <element name="last" type="string"/>
+ </sequence>
+ </group>
+ <attributeGroup name="NameAttributeGroup">
+ <attribute name="firstattribute" type="string"/>
+ <attribute name="secondattribute" type="string"/>
+ <attribute name="thirdattribute" type="string"/>
+ </attributeGroup>
+ <element name="name">
+ <complexType>
+ <group ref="NameGroup"/>
+ <attribute name="title" type="string"/>
+ <attributeGroup ref="NameAttributeGroup"/>
+ </complexType>
+ </element>
+
+</schema>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups_xsd.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups_xsd.txt?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups_xsd.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups_xsd.txt Fri May 26 04:01:22 2006
@@ -0,0 +1,29 @@
+***** TYPES BEFORE RESOLVE **********************************
+Type:commonj.sdo#BigDecimal
+Type:commonj.sdo#BigInteger
+Type:commonj.sdo#Boolean
+Type:commonj.sdo#Byte
+Type:commonj.sdo#Bytes
+Type:commonj.sdo#ChangeSummary
+Type:commonj.sdo#Character
+Type:commonj.sdo#DataObject
+Type:commonj.sdo#Date
+Type:commonj.sdo#Double
+Type:commonj.sdo#Float
+Type:commonj.sdo#Integer
+Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
+Type:commonj.sdo#Short
+Type:commonj.sdo#String
+Type:commonj.sdo#URI
+Type:http://www.wrox.com/name#RootType
+Property:name of type name
+Type:http://www.wrox.com/name#name
+Property:first of type String
+Property:middle of type String
+Property:last of type String
+Property:title of type String
+Property:firstattribute of type String
+Property:secondattribute of type String
+Property:thirdattribute of type String
+*******************************END TYPES******************
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/bothgroups_xsd.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename.xsd?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename.xsd (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename.xsd Fri May 26 04:01:22 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.wrox.com/name"
+xmlns:target="http://www.wrox.com/name" elementFormDefault="qualified">
+ <group name="NameGroup">
+ <sequence>
+ <element name="first" type="string"/>
+ <element name="middle" type="string"/>
+ <element name="last" type="string"/>
+ </sequence>
+ </group>
+ <attributeGroup name="NameGroup">
+ <attribute name="firstattribute" type="string"/>
+ <attribute name="secondattribute" type="string"/>
+ <attribute name="thirdattribute" type="string"/>
+ </attributeGroup>
+ <element name="name">
+ <complexType>
+ <group ref="NameGroup"/>
+ <attribute name="title" type="string"/>
+ <attributeGroup ref="NameGroup"/>
+ </complexType>
+ </element>
+
+</schema>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename_xsd.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename_xsd.txt?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename_xsd.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename_xsd.txt Fri May 26 04:01:22 2006
@@ -0,0 +1,29 @@
+***** TYPES BEFORE RESOLVE **********************************
+Type:commonj.sdo#BigDecimal
+Type:commonj.sdo#BigInteger
+Type:commonj.sdo#Boolean
+Type:commonj.sdo#Byte
+Type:commonj.sdo#Bytes
+Type:commonj.sdo#ChangeSummary
+Type:commonj.sdo#Character
+Type:commonj.sdo#DataObject
+Type:commonj.sdo#Date
+Type:commonj.sdo#Double
+Type:commonj.sdo#Float
+Type:commonj.sdo#Integer
+Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
+Type:commonj.sdo#Short
+Type:commonj.sdo#String
+Type:commonj.sdo#URI
+Type:http://www.wrox.com/name#RootType
+Property:name of type name
+Type:http://www.wrox.com/name#name
+Property:first of type String
+Property:middle of type String
+Property:last of type String
+Property:title of type String
+Property:firstattribute of type String
+Property:secondattribute of type String
+Property:thirdattribute of type String
+*******************************END TYPES******************
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/bothgroupssamename_xsd.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup.xsd?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup.xsd (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup.xsd Fri May 26 04:01:22 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.wrox.com/name"
+xmlns:target="http://www.wrox.com/name" elementFormDefault="qualified">
+ <group name="NameGroup">
+ <sequence>
+ <element name="first" type="string"/>
+ <element name="middle" type="string"/>
+ <element name="last" type="string"/>
+ <group name="NameGroup2">
+ <sequence>
+ <element name="first2" type="string"/>
+ <element name="middle2" type="string"/>
+ <element name="last2" type="string"/>
+ </sequence>
+ </group>
+ </sequence>
+ </group>
+ <element name="name">
+ <complexType>
+ <group ref="NameGroup"/>
+ <group ref="NameGroup2"/>
+ <attribute name="title" type="string"/>
+ </complexType>
+ </element>
+
+</schema>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup_xsd.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup_xsd.txt?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup_xsd.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup_xsd.txt Fri May 26 04:01:22 2006
@@ -0,0 +1,25 @@
+***** TYPES BEFORE RESOLVE **********************************
+Type:commonj.sdo#BigDecimal
+Type:commonj.sdo#BigInteger
+Type:commonj.sdo#Boolean
+Type:commonj.sdo#Byte
+Type:commonj.sdo#Bytes
+Type:commonj.sdo#ChangeSummary
+Type:commonj.sdo#Character
+Type:commonj.sdo#DataObject
+Type:commonj.sdo#Date
+Type:commonj.sdo#Double
+Type:commonj.sdo#Float
+Type:commonj.sdo#Integer
+Type:commonj.sdo#Long
+Type:commonj.sdo#Short
+Type:commonj.sdo#String
+Type:commonj.sdo#URI
+Type:http://www.wrox.com/name#RootType
+Property:name of type name
+Type:http://www.wrox.com/name#name
+Property:first of type String
+Property:middle of type String
+Property:last of type String
+Property:title of type String
+*******************************END TYPES******************
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/groupingroup_xsd.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup.xsd?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup.xsd (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup.xsd Fri May 26 04:01:22 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.wrox.com/name"
+xmlns:target="http://www.wrox.com/name" elementFormDefault="qualified">
+ <group name="NameGroup2">
+ <sequence>
+ <element name="first2" type="string"/>
+ <element name="middle2" type="string"/>
+ <element name="last2" type="string"/>
+ </sequence>
+ </group>
+ <group name="NameGroup">
+ <sequence>
+ <element name="first" type="string"/>
+ <element name="middle" type="string"/>
+ <element name="last" type="string"/>
+ <group ref="NameGroup2"/>
+ </sequence>
+ </group>
+ <element name="name">
+ <complexType>
+ <group ref="NameGroup"/>
+ <attribute name="title" type="string"/>
+ </complexType>
+ </element>
+
+</schema>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup_xsd.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup_xsd.txt?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup_xsd.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup_xsd.txt Fri May 26 04:01:22 2006
@@ -0,0 +1,29 @@
+***** TYPES BEFORE RESOLVE **********************************
+Type:commonj.sdo#BigDecimal
+Type:commonj.sdo#BigInteger
+Type:commonj.sdo#Boolean
+Type:commonj.sdo#Byte
+Type:commonj.sdo#Bytes
+Type:commonj.sdo#ChangeSummary
+Type:commonj.sdo#Character
+Type:commonj.sdo#DataObject
+Type:commonj.sdo#Date
+Type:commonj.sdo#Double
+Type:commonj.sdo#Float
+Type:commonj.sdo#Integer
+Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
+Type:commonj.sdo#Short
+Type:commonj.sdo#String
+Type:commonj.sdo#URI
+Type:http://www.wrox.com/name#RootType
+Property:name of type name
+Type:http://www.wrox.com/name#name
+Property:first of type String
+Property:middle of type String
+Property:last of type String
+Property:first2 of type String
+Property:middle2 of type String
+Property:last2 of type String
+Property:title of type String
+*******************************END TYPES******************
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/grouprefingroup_xsd.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate.xsd?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate.xsd (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate.xsd Fri May 26 04:01:22 2006
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.wrox.com/name"
+xmlns:target="http://www.wrox.com/name" elementFormDefault="qualified">
+ <element name="name">
+ <complexType>
+ <group ref="NameGroup"/>
+ <attribute name="title" type="string"/>
+ </complexType>
+ </element>
+ <group name="NameGroup">
+ <sequence>
+ <element name="first" type="string"/>
+ <element name="middle" type="string"/>
+ <element name="last" type="string"/>
+ </sequence>
+ </group>
+
+</schema>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate_xsd.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate_xsd.txt?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate_xsd.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate_xsd.txt Fri May 26 04:01:22 2006
@@ -0,0 +1,26 @@
+***** TYPES BEFORE RESOLVE **********************************
+Type:commonj.sdo#BigDecimal
+Type:commonj.sdo#BigInteger
+Type:commonj.sdo#Boolean
+Type:commonj.sdo#Byte
+Type:commonj.sdo#Bytes
+Type:commonj.sdo#ChangeSummary
+Type:commonj.sdo#Character
+Type:commonj.sdo#DataObject
+Type:commonj.sdo#Date
+Type:commonj.sdo#Double
+Type:commonj.sdo#Float
+Type:commonj.sdo#Integer
+Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
+Type:commonj.sdo#Short
+Type:commonj.sdo#String
+Type:commonj.sdo#URI
+Type:http://www.wrox.com/name#RootType
+Property:name of type name
+Type:http://www.wrox.com/name#name
+Property:first of type String
+Property:middle of type String
+Property:last of type String
+Property:title of type String
+*******************************END TYPES******************
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/grouptoolate_xsd.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix.xsd?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix.xsd (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix.xsd Fri May 26 04:01:22 2006
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.wrox.com/name"
+xmlns:target="http://www.wrox.com/name" elementFormDefault="qualified">
+ <group name="target:NameGroup">
+ <sequence>
+ <element name="first" type="string"/>
+ <element name="middle" type="string"/>
+ <element name="last" type="string"/>
+ </sequence>
+ </group>
+ <element name="name">
+ <complexType>
+ <group ref="target:NameGroup"/>
+ <attribute name="title" type="string"/>
+ </complexType>
+ </element>
+
+</schema>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix_xsd.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix_xsd.txt?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix_xsd.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix_xsd.txt Fri May 26 04:01:22 2006
@@ -0,0 +1,26 @@
+***** TYPES BEFORE RESOLVE **********************************
+Type:commonj.sdo#BigDecimal
+Type:commonj.sdo#BigInteger
+Type:commonj.sdo#Boolean
+Type:commonj.sdo#Byte
+Type:commonj.sdo#Bytes
+Type:commonj.sdo#ChangeSummary
+Type:commonj.sdo#Character
+Type:commonj.sdo#DataObject
+Type:commonj.sdo#Date
+Type:commonj.sdo#Double
+Type:commonj.sdo#Float
+Type:commonj.sdo#Integer
+Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
+Type:commonj.sdo#Short
+Type:commonj.sdo#String
+Type:commonj.sdo#URI
+Type:http://www.wrox.com/name#RootType
+Property:name of type name
+Type:http://www.wrox.com/name#name
+Property:first of type String
+Property:middle of type String
+Property:last of type String
+Property:title of type String
+*******************************END TYPES******************
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/groupwithprefix_xsd.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sdo/runtime/core/test/groupwrongname.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/groupwrongname.xsd?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/groupwrongname.xsd (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/groupwrongname.xsd Fri May 26 04:01:22 2006
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.wrox.com/name"
+xmlns:target="http://www.wrox.com/name" elementFormDefault="qualified">
+ <group name="NoNameGroup">
+ <sequence>
+ <element name="first" type="string"/>
+ <element name="middle" type="string"/>
+ <element name="last" type="string"/>
+ </sequence>
+ </group>
+ <element name="name">
+ <complexType>
+ <group ref="NameGroup"/>
+ <attribute name="title" type="string"/>
+ </complexType>
+ </element>
+
+</schema>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/groupwrongname.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/groupwrongname.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/list1.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/list1.xml?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/list1.xml (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/list1.xml Fri May 26 04:01:22 2006
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<listtest
+ xmlns="http://www.wrox.com/name"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-Instance"
+ xsi:schemaLocation="http://www.wrox.com/name name.xsd">
+ <integers>1 2 3 4 5 6 7 8 9</integers>
+ <strings>
+ This
+is a strange
+ set of strings
+ </strings>
+</listtest>
+
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/list1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/list1.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/list1.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/list1.xsd?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/list1.xsd (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/list1.xsd Fri May 26 04:01:22 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.wrox.com/name"
+ xmlns:tns="http://www.wrox.com/name">
+
+<xs:element name="listtest" type="listTestType"/>
+<xs:complexType name="listTestType">
+ <xs:element name="integers" type="intListType"/>
+ <xs:element name="strings" type="stringListType"/>
+</xs:complexType>
+
+<xs:simpleType name="intListType">
+ <xs:list itemType="xs:integer"/>
+</xs:simpleType>
+
+<xs:simpleType name="stringListType">
+ <xs:list itemType="xs:string"/>
+</xs:simpleType>
+
+</xs:schema>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/list1.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/list1.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/list1_xml.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/list1_xml.txt?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/list1_xml.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/list1_xml.txt Fri May 26 04:01:22 2006
@@ -0,0 +1,70 @@
+***** TYPES AFTER RESOLVE*********************************
+Type:commonj.sdo#BigDecimal
+Type:commonj.sdo#BigInteger
+Type:commonj.sdo#Boolean
+Type:commonj.sdo#Byte
+Type:commonj.sdo#Bytes
+Type:commonj.sdo#ChangeSummary
+Type:commonj.sdo#Character
+Type:commonj.sdo#DataObject
+Type:commonj.sdo#Date
+Type:commonj.sdo#Double
+Type:commonj.sdo#Float
+Type:commonj.sdo#Integer
+Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
+Type:commonj.sdo#Short
+Type:commonj.sdo#String
+Type:commonj.sdo#URI
+Type:http://www.wrox.com/name#RootType
+Property:listtest of type listTestType
+Type:http://www.wrox.com/name#intListType
+Property:values (many) of type Integer
+Type:http://www.wrox.com/name#listTestType
+Property:integers (many) of type intListType
+Property:strings (many) of type stringListType
+Type:http://www.wrox.com/name#stringListType
+Property:values (many) of type String
+*******************************END TYPES******************
+===== DataObject contents =====
+integers: list dataObject[0]=
+===== DataObject contents =====
+values: list integer[0]=1
+
+integer[1]=2
+
+integer[2]=3
+
+integer[3]=4
+
+integer[4]=5
+
+integer[5]=6
+
+integer[6]=7
+
+integer[7]=8
+
+integer[8]=9
+
+===== End DataObject =====
+
+strings: list dataObject[0]=
+===== DataObject contents =====
+values: list string[0]=This
+
+string[1]=is
+
+string[2]=a
+
+string[3]=strange
+
+string[4]=set
+
+string[5]=of
+
+string[6]=strings
+
+===== End DataObject =====
+
+===== End DataObject =====
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/list1_xml.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sdo/runtime/core/test/list1_xsd.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/list1_xsd.txt?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/list1_xsd.txt (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/list1_xsd.txt Fri May 26 04:01:22 2006
@@ -0,0 +1,28 @@
+***** TYPES BEFORE RESOLVE **********************************
+Type:commonj.sdo#BigDecimal
+Type:commonj.sdo#BigInteger
+Type:commonj.sdo#Boolean
+Type:commonj.sdo#Byte
+Type:commonj.sdo#Bytes
+Type:commonj.sdo#ChangeSummary
+Type:commonj.sdo#Character
+Type:commonj.sdo#DataObject
+Type:commonj.sdo#Date
+Type:commonj.sdo#Double
+Type:commonj.sdo#Float
+Type:commonj.sdo#Integer
+Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
+Type:commonj.sdo#Short
+Type:commonj.sdo#String
+Type:commonj.sdo#URI
+Type:http://www.wrox.com/name#RootType
+Property:listtest of type listTestType
+Type:http://www.wrox.com/name#intListType
+Property:values (many) of type Integer
+Type:http://www.wrox.com/name#listTestType
+Property:integers (many) of type intListType
+Property:strings (many) of type stringListType
+Type:http://www.wrox.com/name#stringListType
+Property:values (many) of type String
+*******************************END TYPES******************
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/list1_xsd.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?rev=409639&r1=409638&r2=409639&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp Fri May 26 04:01:22 2006
@@ -44,8 +44,24 @@
int totaltests=0;
int value = 0;
- /* general tests */
+ /* groups now supported*/
+ TEST ( sdotest::testany("list1.xsd",0,"list1.xml", 0) );
+ TEST ( sdotest::testany("b48636.xsd",0,"b48636.xml", 0) );
+ TEST ( sdotest::testany("groupwithprefix.xsd", 0, 0, 0) );
+ TEST ( sdotest::testany("groupwrongname.xsd","Use of undefined group NameGroup", 0, 0) );
+
+ // late definition of group now supported
+ TEST ( sdotest::testany("grouptoolate.xsd",0 , 0, 0) );
+
+ // group definition within group now ignored
+ TEST ( sdotest::testany("groupingroup.xsd","Use of undefined group NameGroup2",0, 0) );
+ TEST ( sdotest::testany("grouprefingroup.xsd",0,0, 0) );
+ TEST ( sdotest::testany("bothgroups.xsd",0,0, 0) );
+ TEST ( sdotest::testany("bothgroupssamename.xsd",0,0, 0) );
+
+ /* general tests */
+ TEST ( sdotest::pete() );
TEST ( sdotest::stocktest() );
TEST ( sdotest::definetest() );
TEST ( sdotest::emptycs() );
Added: incubator/tuscany/cpp/sdo/runtime/core/test/pete.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/pete.xml?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/pete.xml (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/pete.xml Fri May 26 04:01:22 2006
@@ -0,0 +1,20 @@
+<StockQuotes>
+<Stock>
+<Symbol>IBM</Symbol>
+<Last>79.78</Last>
+<Date>5/24/2006</Date>
+<Time>4:01pm</Time>
+<Change>0.00</Change>
+<Open>N/A</Open>
+<High>N/A</High>
+<Low>N/A</Low>
+<Volume>900</Volume>
+<MktCap>123.7B</MktCap>
+<PreviousClose>79.78</PreviousClose>
+<PercentageChange>0.00</PercentageChange>
+<AnnRange>73.45 - 89.94</AnnRange>
+<Earns>5.121</Earns>
+<P-E>15.58</P-E>
+<Name>INTL BUSINESS MAC</Name>
+</Stock>
+</StockQuotes>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/pete.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/pete.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sdo/runtime/core/test/pete.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/pete.xsd?rev=409639&view=auto
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/pete.xsd (added)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/pete.xsd Fri May 26 04:01:22 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="StockQuotes">
+ <xs:complexType >
+ <xs:sequence>
+ <xs:element name="Stock" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="1" name="Symbol" type="xs:string"/>
+ <xs:element minOccurs="0" maxOccurs="1" name="Last" type="xs:float"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <anyAttribute namespace="##any" processContents="lax"/>
+ </xs:complexType>
+</xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/pete.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sdo/runtime/core/test/pete.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
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?rev=409639&r1=409638&r2=409639&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h Fri May 26 04:01:22 2006
@@ -60,6 +60,7 @@
static int definetest();
static int stocktest();
+ static int pete();
static int testgenerate(const char* xsd, const char* output);
static int emptycs();
static int compatiblefactory();
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp?rev=409639&r1=409638&r2=409639&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp Fri May 26 04:01:22 2006
@@ -1218,4 +1218,82 @@
return 0;
}
}
-**************************************************/
\ No newline at end of file
+**************************************************/
+
+
+int sdotest::pete()
+{
+
+
+ int i,j;
+
+ try {
+
+
+ DataFactoryPtr mdg = DataFactory::getDataFactory();
+
+ XSDHelperPtr xsh = HelperProvider::getXSDHelper(mdg);
+
+ xsh->defineFile("pete.xsd");
+
+ if ((i = xsh->getErrorCount()) > 0)
+ {
+ for (j=0;j<i;j++)
+ {
+ const char *m = xsh->getErrorMessage(j);
+ if (m != 0) cout << m;
+ cout << endl;
+ }
+ return 0;
+ }
+
+
+
+ XMLHelperPtr xmh = HelperProvider::getXMLHelper(mdg);
+
+ XMLDocumentPtr doc = xmh->loadFile("pete.xml");
+
+ if ((i = xmh->getErrorCount()) > 0)
+ {
+ for (j=0;j<i;j++)
+ {
+ const char *m = xmh->getErrorMessage(j);
+ if (m != 0) cout << m;
+ cout << endl;
+ }
+ return 0;
+ }
+
+ TypeList tl = mdg->getTypes();
+
+ //printf("***** TYPES **********************************************\n");
+
+ for (i=0;i<tl.size();i++)
+ {
+ //printf("Type:%s#%s\n",tl[i].getURI(),tl[i].getName());
+ PropertyList pl = tl[i].getProperties();
+ for (int j=0;j<pl.size();j++)
+ {
+ //printf("Property:%s ",pl[j].getName());
+ //if (pl[j].isMany())
+ //printf( "(many) ");
+ //printf( " of type %s\n",pl[j].getType().getName());
+ }
+ }
+
+ //printf( "*******************************END TYPES******************\n");
+
+
+ DataObjectPtr dob = doc->getRootDataObject();
+ float f = dob->getFloat("Stock[1]/Last");
+ //printf("Float is %2.3f \r\n",f);
+ return 1;
+
+ }
+ catch (SDORuntimeException e)
+ {
+ cout << "Exception in Pete" << e << endl;
+ return 0;
+ }
+}
+
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp?rev=409639&r1=409638&r2=409639&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp Fri May 26 04:01:22 2006
@@ -26,7 +26,7 @@
#include "sdotest.h"
-bool sdotest::silent = true;
+bool sdotest::silent = false;
bool sdotest::ramping = false;
void sdotest::printOldValues(FILE *f, ChangeSummaryPtr cs, DataObjectPtr dol)
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org