From: Mary T. <mak...@us...> - 2011-06-16 15:07:01
|
Update of /cvsroot/cfidev/core/schema In directory vz-cvs-2.sog:/tmp/cvs-serv23800 Modified Files: objb.xsd Log Message: objb.xsd - aexLT namespace added - aexLt:lt="0" attributes added to: sourceObject; copiedObject; obj:BaseObject element ref sourceObjectReference and customBaseObject; obj:BaseObject attributes approvedNameSpace, contentType, contextURL, currencyCode, directReferenceURI, language, objectState, organizationID, ownerUserSchemaRelease, namespace, schemaRelease, unitSet, version, versionIndex, xmlContent, ##other; sourceObjectReference; BaseObjectReference (type + element); EObjectState (and element); EObjectStateReference (and element); EContentType (and element); EXMLContent (and element); EApprovedNameSpace (and element), as these elements and attributes in cfiXML objects, which support identification, units, referencing, versions, revisions etc.are not to be included in LT schema. (Note - this excludes obj:BaseObject revision attribute, which is required in LT schema.) - documentation update Index: objb.xsd =================================================================== RCS file: /cvsroot/cfidev/core/schema/objb.xsd,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** objb.xsd 1 Jun 2011 18:26:21 -0000 1.17 --- objb.xsd 16 Jun 2011 15:06:59 -0000 1.18 *************** *** 4,10 **** <!-- C O P Y R I G H T N O T I C E "Portions Copyright (C) 2001-2004 AIChE-DIPPR, All Rights Reserved. ! "Portions Copyright (C) 2004-2010 Alar Engineering Software, All Rights Reserved. "Portions Copyright (C) 2001-2004 ePlantData, Inc. All Rights Reserved. ! "Portions Copyright (C) 2002-2010 FIATECH, All Rights Reserved. This file contains Original Code and/or Modifications of Original Code (the "Contents") as defined --- 4,10 ---- <!-- C O P Y R I G H T N O T I C E "Portions Copyright (C) 2001-2004 AIChE-DIPPR, All Rights Reserved. ! "Portions Copyright (C) 2004-2011 Alar Engineering Software, All Rights Reserved. "Portions Copyright (C) 2001-2004 ePlantData, Inc. All Rights Reserved. ! "Portions Copyright (C) 2002-2011 FIATECH, All Rights Reserved. This file contains Original Code and/or Modifications of Original Code (the "Contents") as defined *************** *** 19,23 **** NON-INFRINGEMENT. --> ! <xsd:schema xmlns="http://www.cfixml.org/objb" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:etl="http://www.cfixml.org/etl" xmlns:ext="http://www.cfixml.org/ext" xmlns:pq="http://www.cfixml.org/pq" targetNamespace="http://www.cfixml.org/objb" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.00.0000"> <xsd:import namespace="http://www.cfixml.org/ext" schemaLocation="ext.xsd"/> <xsd:import namespace="http://www.cfixml.org/pq" schemaLocation="pq.xsd"/> --- 19,23 ---- NON-INFRINGEMENT. --> ! <xsd:schema xmlns="http://www.cfixml.org/objb" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:etl="http://www.cfixml.org/etl" xmlns:ext="http://www.cfixml.org/ext" xmlns:pq="http://www.cfixml.org/pq" xmlns:aexLt="http://www.cfixml.org/aexLt" targetNamespace="http://www.cfixml.org/objb" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.00.0000"> <xsd:import namespace="http://www.cfixml.org/ext" schemaLocation="ext.xsd"/> <xsd:import namespace="http://www.cfixml.org/pq" schemaLocation="pq.xsd"/> *************** *** 27,30 **** --- 27,31 ---- Title: Support for objects, registries and the multi object structure across resources. $Revision$ + $Date$ $Modtime: 3/29/04 11:59a $ $Author$, Alar Eng Software Inc, *************** *** 40,45 **** --> ! <xsd:element name="sourceObject" type="BaseObject"/> ! <xsd:element name="copiedObject" type="BaseObject"/> <xsd:element name="baseObject" type="BaseObject"/> <xsd:complexType name="BaseObject" id="BaseObject"> --- 41,46 ---- --> ! <xsd:element name="sourceObject" type="BaseObject" aexLt:lt="0"/> ! <xsd:element name="copiedObject" type="BaseObject" aexLt:lt="0"/> <xsd:element name="baseObject" type="BaseObject"/> <xsd:complexType name="BaseObject" id="BaseObject"> *************** *** 70,75 **** </xsd:annotation> </xsd:element> ! <xsd:element ref="sourceObjectReference" minOccurs="0"/> ! <xsd:element name="customBaseObject" type="ext:Custom" id="customBaseObject" minOccurs="0"> <xsd:annotation> <xsd:appinfo> --- 71,76 ---- </xsd:annotation> </xsd:element> ! <xsd:element ref="sourceObjectReference" minOccurs="0" aexLt:lt="0"/> ! <xsd:element name="customBaseObject" type="ext:Custom" id="customBaseObject" minOccurs="0" aexLt:lt="0"> <xsd:annotation> <xsd:appinfo> *************** *** 81,95 **** </xsd:sequence> <xsd:attributeGroup ref="ext:BaseObjAttributeGroup"/> ! <xsd:attribute name="approvedNameSpace" type="EApprovedNameSpace" use="optional"> <xsd:annotation> <xsd:documentation>cfiXML approved Schemas such as PIDX, ebXML or other international standard XSD</xsd:documentation> </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="contentType" type="xsd:string" use="optional" default="text/xml"> <xsd:annotation> <xsd:documentation>Allow objects to contain other information such as image/svt+xml to support images contained in XML instance files</xsd:documentation> </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="contextURL" type="ext:URINilA" use="optional"> <xsd:annotation> <xsd:documentation>URL that represents the context or owner of the object.</xsd:documentation> --- 82,96 ---- </xsd:sequence> <xsd:attributeGroup ref="ext:BaseObjAttributeGroup"/> ! <xsd:attribute name="approvedNameSpace" type="EApprovedNameSpace" use="optional" aexLt:lt="0"> <xsd:annotation> <xsd:documentation>cfiXML approved Schemas such as PIDX, ebXML or other international standard XSD</xsd:documentation> </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="contentType" type="xsd:string" use="optional" default="text/xml" aexLt:lt="0"> <xsd:annotation> <xsd:documentation>Allow objects to contain other information such as image/svt+xml to support images contained in XML instance files</xsd:documentation> </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="contextURL" type="ext:URINilA" use="optional" aexLt:lt="0"> <xsd:annotation> <xsd:documentation>URL that represents the context or owner of the object.</xsd:documentation> *************** *** 100,105 **** </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="currencyCode" type="ext:ECurrencyCode" use="optional" default="USD"/> ! <xsd:attribute name="directReferenceURI" use="optional"> <xsd:annotation> <xsd:documentation>For objectState is refUri - the URI to a file that contains the object data. The URI must include a file extension. The processor will not assume any default extension. Also valid for when objectState is fullXMLReadCopy indicating the source URI if the copy was made from a refUri object.</xsd:documentation> --- 101,106 ---- </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="currencyCode" type="ext:ECurrencyCode" use="optional" default="USD" aexLt:lt="0"/> ! <xsd:attribute name="directReferenceURI" use="optional" aexLt:lt="0"> <xsd:annotation> <xsd:documentation>For objectState is refUri - the URI to a file that contains the object data. The URI must include a file extension. The processor will not assume any default extension. Also valid for when objectState is fullXMLReadCopy indicating the source URI if the copy was made from a refUri object.</xsd:documentation> *************** *** 116,122 **** <appLongName>Is Light XML</appLongName> </xsd:appinfo> ! </xsd:annotation> ! </xsd:attribute> ! <xsd:attribute name="language" type="xsd:language" use="optional" default="en"/> <xsd:attribute name="objectID" type="ext:ObjID" use="optional"> <xsd:annotation> --- 117,123 ---- <appLongName>Is Light XML</appLongName> </xsd:appinfo> ! </xsd:annotation> ! </xsd:attribute> ! <xsd:attribute name="language" type="xsd:language" use="optional" default="en" aexLt:lt="0"/> <xsd:attribute name="objectID" type="ext:ObjID" use="optional"> <xsd:annotation> *************** *** 128,132 **** </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="objectState" type="EObjectState" use="optional" default="fullXML"> <xsd:annotation> <xsd:documentation>Object state including containing XML or a reference.</xsd:documentation> --- 129,133 ---- </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="objectState" type="EObjectState" use="optional" default="fullXML" aexLt:lt="0"> <xsd:annotation> <xsd:documentation>Object state including containing XML or a reference.</xsd:documentation> *************** *** 137,147 **** </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="organizationID" type="xsd:string" use="optional"> <xsd:annotation> <xsd:documentation>The universal unique identifier for the organization who owns the data object. This string should include the full unique identifier, e.g., for a company, this would include 1.2.840.1.xxxxx, where xxxx is the ANSI issued unique company identifier. See ANSI Procedures for registering organization names in the United States of America under the Joint-ISO-CCIT arc", http://web.ansi.org/public/services/reg_org.html</xsd:documentation> </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="ownerUserSchemaRelease" type="ext:Version" use="optional"/> ! <xsd:attribute name="nameSpace" type="xsd:string" use="optional"> <xsd:annotation> <xsd:documentation>Other non-approved schemas</xsd:documentation> --- 138,148 ---- </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="organizationID" type="xsd:string" use="optional" aexLt:lt="0"> <xsd:annotation> <xsd:documentation>The universal unique identifier for the organization who owns the data object. This string should include the full unique identifier, e.g., for a company, this would include 1.2.840.1.xxxxx, where xxxx is the ANSI issued unique company identifier. See ANSI Procedures for registering organization names in the United States of America under the Joint-ISO-CCIT arc", http://web.ansi.org/public/services/reg_org.html</xsd:documentation> </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="ownerUserSchemaRelease" type="ext:Version" use="optional" aexLt:lt="0"/> ! <xsd:attribute name="nameSpace" type="xsd:string" use="optional" aexLt:lt="0"> <xsd:annotation> <xsd:documentation>Other non-approved schemas</xsd:documentation> *************** *** 157,170 **** </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="schemaRelease" type="ext:Version" use="optional"/> ! <xsd:attribute name="unitSet" type="pq:ESet" use="optional" default="SI"/> ! <xsd:attribute name="version" type="ext:CRCVersion" use="optional"/> ! <xsd:attribute name="versionIndex" type="ext:Base1IndexAtt" use="optional"/> ! <xsd:attribute name="xmlContent" type="EXMLContent" use="optional" default="cfiXML"> <xsd:annotation> <xsd:documentation>To support other approved or recommended XML such as PIDX for company information that is to be processed by compatible software</xsd:documentation> </xsd:annotation> </xsd:attribute> ! <xsd:anyAttribute namespace="##other" processContents="lax"/> </xsd:complexType> <!-- --> --- 158,171 ---- </xsd:annotation> </xsd:attribute> ! <xsd:attribute name="schemaRelease" type="ext:Version" use="optional" aexLt:lt="0"/> ! <xsd:attribute name="unitSet" type="pq:ESet" use="optional" default="SI" aexLt:lt="0"/> ! <xsd:attribute name="version" type="ext:CRCVersion" use="optional" aexLt:lt="0"/> ! <xsd:attribute name="versionIndex" type="ext:Base1IndexAtt" use="optional" aexLt:lt="0"/> ! <xsd:attribute name="xmlContent" type="EXMLContent" use="optional" default="cfiXML" aexLt:lt="0"> <xsd:annotation> <xsd:documentation>To support other approved or recommended XML such as PIDX for company information that is to be processed by compatible software</xsd:documentation> </xsd:annotation> </xsd:attribute> ! <xsd:anyAttribute namespace="##other" processContents="lax" aexLt:lt="0"/> </xsd:complexType> <!-- --> *************** *** 175,181 **** --> ! <xsd:element name="sourceObjectReference" type="BaseObjectReference"/> ! <xsd:element name="baseObjectReference" type="BaseObjectReference"/> ! <xsd:complexType name="BaseObjectReference"> <xsd:annotation> <xsd:documentation>cfiXML object base type.</xsd:documentation> --- 176,182 ---- --> ! <xsd:element name="sourceObjectReference" type="BaseObjectReference" aexLt:lt="0"/> ! <xsd:element name="baseObjectReference" type="BaseObjectReference" aexLt:lt="0"/> ! <xsd:complexType name="BaseObjectReference" aexLt:lt="0"> <xsd:annotation> <xsd:documentation>cfiXML object base type.</xsd:documentation> *************** *** 204,208 **** </xsd:annotation> </xsd:element> ! <xsd:element name="customBaseObject" type="ext:Custom" minOccurs="0"> <xsd:annotation> <xsd:appinfo> --- 205,209 ---- </xsd:annotation> </xsd:element> ! <xsd:element name="customBaseObject" type="ext:Custom" minOccurs="0" aexLt:lt="0"> <xsd:annotation> <xsd:appinfo> *************** *** 298,302 **** Object Status i.e. Does it contain a full XML data set, changes only or only a reference --> ! <xsd:simpleType name="EObjectState"> <xsd:restriction base="xsd:Name"> <xsd:enumeration value="fullXML"> --- 299,303 ---- Object Status i.e. Does it contain a full XML data set, changes only or only a reference --> ! <xsd:simpleType name="EObjectState" aexLt:lt="0"> <xsd:restriction base="xsd:Name"> <xsd:enumeration value="fullXML"> *************** *** 354,358 **** </xsd:restriction> </xsd:simpleType> ! <xsd:group name="ObjectState"> <xsd:sequence> <xsd:element name="objectState"> --- 355,359 ---- </xsd:restriction> </xsd:simpleType> ! <xsd:group name="ObjectState" aexLt:lt="0"> <xsd:sequence> <xsd:element name="objectState"> *************** *** 373,377 **** Reference states ONLY: --> ! <xsd:simpleType name="EObjectStateReference"> <xsd:restriction base="xsd:Name"> <xsd:enumeration value="external"/> --- 374,378 ---- Reference states ONLY: --> ! <xsd:simpleType name="EObjectStateReference" aexLt:lt="0"> <xsd:restriction base="xsd:Name"> <xsd:enumeration value="external"/> *************** *** 406,410 **** </xsd:restriction> </xsd:simpleType> ! <xsd:group name="ObjectStateReference"> <xsd:sequence> <xsd:element name="objectStateReference"> --- 407,411 ---- </xsd:restriction> </xsd:simpleType> ! <xsd:group name="ObjectStateReference" aexLt:lt="0"> <xsd:sequence> <xsd:element name="objectStateReference"> *************** *** 423,427 **** Object content type (http type) --> ! <xsd:simpleType name="EContentType"> <xsd:restriction base="xsd:string"> <xsd:enumeration value="text/xml"/> --- 424,428 ---- Object content type (http type) --> ! <xsd:simpleType name="EContentType" aexLt:lt="0"> <xsd:restriction base="xsd:string"> <xsd:enumeration value="text/xml"/> *************** *** 430,434 **** </xsd:restriction> </xsd:simpleType> ! <xsd:group name="ContentType"> <xsd:sequence> <xsd:element name="contentType"> --- 431,435 ---- </xsd:restriction> </xsd:simpleType> ! <xsd:group name="ContentType" aexLt:lt="0"> <xsd:sequence> <xsd:element name="contentType"> *************** *** 447,451 **** XML Content --> ! <xsd:simpleType name="EXMLContent"> <xsd:restriction base="xsd:Name"> <xsd:enumeration value="approvedXML"/> --- 448,452 ---- XML Content --> ! <xsd:simpleType name="EXMLContent" aexLt:lt="0"> <xsd:restriction base="xsd:Name"> <xsd:enumeration value="approvedXML"/> *************** *** 456,460 **** </xsd:restriction> </xsd:simpleType> ! <xsd:group name="XMLContent"> <xsd:sequence> <xsd:element name="xmlContent"> --- 457,461 ---- </xsd:restriction> </xsd:simpleType> ! <xsd:group name="XMLContent" aexLt:lt="0"> <xsd:sequence> <xsd:element name="xmlContent"> *************** *** 473,477 **** Approved XML namespaces - place holder for now. --> ! <xsd:simpleType name="EApprovedNameSpace"> <xsd:restriction base="xsd:string"> <xsd:enumeration value="_"/> --- 474,478 ---- Approved XML namespaces - place holder for now. --> ! <xsd:simpleType name="EApprovedNameSpace" aexLt:lt="0"> <xsd:restriction base="xsd:string"> <xsd:enumeration value="_"/> *************** *** 479,483 **** </xsd:restriction> </xsd:simpleType> ! <xsd:group name="ApprovedNameSpace"> <xsd:sequence> <xsd:element name="approvedNameSpace"> --- 480,484 ---- </xsd:restriction> </xsd:simpleType> ! <xsd:group name="ApprovedNameSpace" aexLt:lt="0"> <xsd:sequence> <xsd:element name="approvedNameSpace"> |