← Prev in month
← Prev in thread
Next in thread →
Next in month →
[regrep] Latest schema files
With bug fixes identified by Nikola are attached. Happy Turkey day to
all.
Modified Files:
query.xsd rim.xsd rs.xsd
Log Message:
more bug fixes with Nikola
Index: query.xsd
===================================================================
RCS file: /cvsroot/ebxmlrr/ebxmlrr-spec/misc/schema/query.xsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** query.xsd 2001/11/21 14:07:03 1.4
--- query.xsd 2001/11/22 18:56:15 1.5
***************
*** 104,110 ****
<complexContent>
<extension base = "tns:RegistryObjectQueryType">
! <choice>
<element ref =
"tns:RegistryEntryFilter" minOccurs = "0"
maxOccurs="1"/>
! </choice>
</extension>
</complexContent>
--- 104,110 ----
<complexContent>
<extension base = "tns:RegistryObjectQueryType">
! <sequence>
<element ref =
"tns:RegistryEntryFilter" minOccurs = "0"
maxOccurs="1"/>
! </sequence>
</extension>
</complexContent>
***************
*** 115,121 ****
<complexContent>
<extension base = "tns:RegistryEntryQueryType">
! <choice>
<element ref =
"tns:ClassificationSchemeFilter" minOccurs =
"0" maxOccurs="1"/>
! </choice>
</extension>
</complexContent>
--- 115,121 ----
<complexContent>
<extension base = "tns:RegistryEntryQueryType">
! <sequence>
<element ref =
"tns:ClassificationSchemeFilter" minOccurs =
"0" maxOccurs="1"/>
! </sequence>
</extension>
</complexContent>
***************
*** 265,268 ****
--- 265,269 ----
</complexType>
</element>
+
<element name = "ClassificationNodeQueryResult">
<complexType>
***************
*** 274,277 ****
--- 275,279 ----
</complexType>
</element>
+
<element name = "ClassificationSchemeQueryResult">
<complexType>
***************
*** 330,334 ****
<sequence>
<element ref = "tns:AssociationFilter" minOccurs
= "0" maxOccurs="1"/>
! <choice minOccurs = "0" maxOccurs="unbounded">
<element ref = "tns:RegistryObjectQuery"
minOccurs = "0"
maxOccurs="1"/>
<element ref = "tns:RegistryEntryQuery"
minOccurs = "0"
maxOccurs="1"/>
--- 332,336 ----
<sequence>
<element ref = "tns:AssociationFilter" minOccurs
= "0" maxOccurs="1"/>
! <choice minOccurs = "0" maxOccurs="1">
<element ref = "tns:RegistryObjectQuery"
minOccurs = "0"
maxOccurs="1"/>
<element ref = "tns:RegistryEntryQuery"
minOccurs = "0"
maxOccurs="1"/>
***************
*** 339,347 ****
<element ref =
"tns:RegistryPackageQuery" minOccurs = "0"
maxOccurs="1"/>
<element ref =
"tns:ExtrinsicObjectQuery" minOccurs = "0"
maxOccurs="1"/>
<element ref = "tns:ExternalLinkFilter"
minOccurs = "0"
maxOccurs="1"/>
<element ref =
"tns:ExternalIdentifierFilter" minOccurs = "0"
maxOccurs="1"/>
! <element ref = "tns:UserFilter"
minOccurs = "0" maxOccurs="1"/>
<element ref =
"tns:SourceAssociationBranch" minOccurs = "0"
maxOccurs="1"/>
<element ref =
"tns:TargetAssociationBranch" minOccurs = "0"
maxOccurs="1"/>
</choice>
</sequence>
--- 341,353 ----
<element ref =
"tns:RegistryPackageQuery" minOccurs = "0"
maxOccurs="1"/>
<element ref =
"tns:ExtrinsicObjectQuery" minOccurs = "0"
maxOccurs="1"/>
+ <element ref = "tns:ServiceQuery"
minOccurs = "0" maxOccurs="1"/>
<element ref = "tns:ExternalLinkFilter"
minOccurs = "0"
maxOccurs="1"/>
<element ref =
"tns:ExternalIdentifierFilter" minOccurs = "0"
maxOccurs="1"/>
! <element ref = "tns:UserBranch"
minOccurs = "0" maxOccurs="1"/>
<element ref =
"tns:SourceAssociationBranch" minOccurs = "0"
maxOccurs="1"/>
<element ref =
"tns:TargetAssociationBranch" minOccurs = "0"
maxOccurs="1"/>
+ <element ref =
"tns:ClassificationBranch" minOccurs = "0"
maxOccurs="1"/>
+ <element ref =
"tns:ServiceBindingBranch" minOccurs = "0"
maxOccurs="1"/>
+ <element ref =
"tns:SpecificationLinkBranch" minOccurs = "0"
maxOccurs="1"/>
</choice>
</sequence>
***************
*** 365,369 ****
<sequence>
<element ref = "tns:SlotFilter"
minOccurs = "0" maxOccurs="1"/>
! <element ref = "tns:SlotValuesFilter"
minOccurs = "0" maxOccurs =
"1"/>
</sequence>
</complexType>
--- 371,375 ----
<sequence>
<element ref = "tns:SlotFilter"
minOccurs = "0" maxOccurs="1"/>
! <element ref = "tns:SlotValueFilter"
minOccurs = "0" maxOccurs =
"unbounded"/>
</sequence>
</complexType>
***************
*** 386,391 ****
<element ref = "tns:UserFilter"
minOccurs = "0" maxOccurs="1"/>
<element ref = "tns:PostalAddressFilter"
minOccurs = "0"
maxOccurs="1"/>
! <element ref =
"tns:TelephoneNumberFilter" minOccurs = "0"
maxOccurs="1"/>
! <element ref =
"tns:AuditableEventFilter" minOccurs = "0"
maxOccurs="unbounded"/>
<element ref = "tns:OrganizationQuery"
minOccurs = "0"
maxOccurs="1"/>
</sequence>
--- 392,397 ----
<element ref = "tns:UserFilter"
minOccurs = "0" maxOccurs="1"/>
<element ref = "tns:PostalAddressFilter"
minOccurs = "0"
maxOccurs="1"/>
! <element ref =
"tns:TelephoneNumberFilter" minOccurs = "0"
maxOccurs="unbounded"/>
! <element ref = "tns:AuditableEventQuery"
minOccurs = "0"
maxOccurs="unbounded"/>
<element ref = "tns:OrganizationQuery"
minOccurs = "0"
maxOccurs="1"/>
</sequence>
***************
*** 393,396 ****
--- 399,403 ----
</element>
+
<complexType name = "FilterType">
<sequence>
***************
*** 414,418 ****
<element name = "AuditableEventFilter" type = "tns:FilterType"/>
<element name = "UserFilter" type = "tns:FilterType"/>
! <element name = "SlotValuesFilter" type = "tns:FilterType"/>
<element name = "PostalAddressFilter" type = "tns:FilterType"/>
<element name = "TelephoneNumberFilter" type =
"tns:FilterType"/>
--- 421,425 ----
<element name = "AuditableEventFilter" type = "tns:FilterType"/>
<element name = "UserFilter" type = "tns:FilterType"/>
! <element name = "SlotValueFilter" type = "tns:FilterType"/>
<element name = "PostalAddressFilter" type = "tns:FilterType"/>
<element name = "TelephoneNumberFilter" type =
"tns:FilterType"/>
Index: rim.xsd
===================================================================
RCS file: /cvsroot/ebxmlrr/ebxmlrr-spec/misc/schema/rim.xsd,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** rim.xsd 2001/11/21 14:07:03 1.14
--- rim.xsd 2001/11/22 18:56:15 1.15
***************
*** 436,441 ****
</complexType>
</element>
!
! <complexType name = "RegistryObjectListType">
<choice minOccurs = "0" maxOccurs = "unbounded">
<element ref = "tns:ObjectRef"/>
--- 436,442 ----
</complexType>
</element>
!
!
! <complexType name = "LeafRegistryObjectListType">
<choice minOccurs = "0" maxOccurs = "unbounded">
<element ref = "tns:ObjectRef"/>
***************
*** 449,454 ****
<element ref = "tns:ExtrinsicObject"/>
<element ref = "tns:Organization"/>
- <element ref = "tns:RegistryEntry"/>
- <element ref = "tns:RegistryObject"/>
<element ref = "tns:RegistryPackage"/>
<element ref = "tns:Service"/>
--- 450,453 ----
***************
*** 457,460 ****
--- 456,471 ----
<element ref = "tns:User"/>
</choice>
+ </complexType>
+ <element name = "LeafRegistryObjectList" type =
"LeafRegistryObjectListType"/>
+
+ <complexType name = "RegistryObjectListType">
+ <complexContent>
+ <extension base =
"tns:LeafRegistryObjectListType">
+ <choice minOccurs = "0" maxOccurs =
"unbounded">
+ <element ref =
"tns:RegistryEntry"/>
+ <element ref =
"tns:RegistryObject"/>
+ </choice>
+ </extension>
+ </complexContent>
</complexType>
<element name = "RegistryObjectList" type =
"RegistryObjectListType"/>
Index: rs.xsd
===================================================================
RCS file: /cvsroot/ebxmlrr/ebxmlrr-spec/misc/schema/rs.xsd,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** rs.xsd 2001/11/21 10:43:45 1.15
--- rs.xsd 2001/11/22 18:56:15 1.16
***************
*** 19,42 ****
<import
namespace="urn:oasis:names:tc:ebxml-regrep:query:xsd:2.0"
schemaLocation="./query.xsd"/>
- <element name = "RegistryObjectList">
- <annotation>
- <documentation xml:lang = "en"> Leaf classes
that reflect the concrete
classes in ebRIM </documentation>
- </annotation>
- <!--Can we list base class RegistryEntry instead of all
sub-types of it??-->
- <complexType>
- <choice minOccurs = "0" maxOccurs = "unbounded">
- <element ref = "rim:Association"/>
- <element ref = "rim:Classification"/>
- <element ref =
"rim:ClassificationScheme"/>
- <element ref =
"rim:ClassificationNode"/>
- <element ref = "rim:RegistryPackage"/>
- <element ref = "rim:ExternalLink"/>
- <element ref =
"rim:ExternalIdentifier"/>
- <element ref = "rim:Organization"/>
- <element ref = "rim:ExtrinsicObject"/>
- <element ref = "rim:ObjectRef"/>
- </choice>
- </complexType>
- </element>
<element name = "RequestAcceptedResponse">
--- 19,22 ----
***************
*** 57,61 ****
<complexType>
<sequence>
! <element ref =
"tns:RegistryObjectList"/>
</sequence>
</complexType>
--- 37,41 ----
<complexType>
<sequence>
! <element ref =
"rim:LeafRegistryObjectList"/>
</sequence>
</complexType>
***************
*** 70,74 ****
<complexType>
<sequence>
! <element ref =
"tns:RegistryObjectList"/>
</sequence>
</complexType>
--- 50,54 ----
<complexType>
<sequence>
! <element ref =
"rim:LeafRegistryObjectList"/>
</sequence>
</complexType>
--
Regards,
Farrukh
← Prev in month
← Prev in thread
Next in thread →
Next in month →