Menu
▾
▴
[Cfidev-core-notice] core/schema uo.xsd,1.41,1.42
|
From: Mary T. <mak...@us...> - 2011-04-05 11:11:34
|
Update of /cvsroot/cfidev/core/schema In directory vz-cvs-2.sog:/tmp/cvs-serv21684 Modified Files: uo.xsd Log Message: uo.xsd - copy of MaterialStream renamed MaterialStreamA and attribute abstract='true' added; - annotation updates; - substitutionGroup="materialStream" attribute added to element materialUtilityStream (with type extended from base MaterialStream); - uo:StreamConnection/stream/streamItem altered to uo:streamConnection/materialStream as element reference - uo:ProcessPort/stream/streamItem altered to uo:ProcessPort/materialStream (already a reference). - EStreamType altered to EMaterialStreamType and EEnergyStreamType Index: uo.xsd =================================================================== RCS file: /cvsroot/cfidev/core/schema/uo.xsd,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** uo.xsd 29 Jul 2010 21:07:41 -0000 1.41 --- uo.xsd 5 Apr 2011 11:11:31 -0000 1.42 *************** *** 1,4 **** <?xml version="1.0" encoding="utf-8"?> ! <!-- edited with XMLSpy v2008 sp1 (http://www.altova.com) by Alar Engineering Software Inc. --> <!-- See "cfiXML Process Document.doc" on schema development based on W3C consortium process. --> <!-- C O P Y R I G H T N O T I C E --- 1,4 ---- <?xml version="1.0" encoding="utf-8"?> ! <!-- edited with XMLSpy v2011 (http://www.altova.com) by Mary Turton (Alar Engineering Software Inc) --> <!-- See "cfiXML Process Document.doc" on schema development based on W3C consortium process. --> <!-- C O P Y R I G H T N O T I C E *************** *** 57,85 **** <xsd:sequence> <xsd:element ref="etl:normalFlowDirection" minOccurs="0"/> ! <xsd:element name="stream" minOccurs="0"> ! <xsd:annotation> ! <xsd:documentation>Stream details</xsd:documentation> ! <xsd:appinfo> ! <appShortName>Stream</appShortName> ! <appLongName>Stream or Utility Stream</appLongName> ! </xsd:appinfo> ! </xsd:annotation> ! <xsd:complexType> ! <xsd:sequence> ! <xsd:element name="streamItem" type="Stream" minOccurs="0"> ! <xsd:annotation> ! <xsd:documentation>Stream detail. Derivable to uo:EnergyStream, uo:EnergyUtilityStream, uo:MaterialStream, uo:MaterialUtilityStream. ! </xsd:documentation> ! <xsd:appinfo> ! <appShortName>Stream</appShortName> ! <appLongName>Stream or Utility Stream</appLongName> ! </xsd:appinfo> ! </xsd:annotation> ! </xsd:element> ! <xsd:element ref="streamType" minOccurs="0"/> ! <xsd:element name="customStream" type="ext:Custom" minOccurs="0"/> ! </xsd:sequence> ! </xsd:complexType> ! </xsd:element> <xsd:element name="customProcessPort" type="ext:Custom" minOccurs="0"/> </xsd:sequence> --- 57,62 ---- <xsd:sequence> <xsd:element ref="etl:normalFlowDirection" minOccurs="0"/> ! <xsd:element ref="materialStream" minOccurs="0"/> ! <xsd:element ref="materialStreamType" minOccurs="0"/> <xsd:element name="customProcessPort" type="ext:Custom" minOccurs="0"/> </xsd:sequence> *************** *** 115,143 **** <xsd:sequence> <xsd:element ref="etl:normalFlowDirection" minOccurs="0"/> ! <xsd:element name="stream" minOccurs="0"> ! <xsd:annotation> ! <xsd:documentation>Stream details</xsd:documentation> ! <xsd:appinfo> ! <appShortName>Stream</appShortName> ! <appLongName>Stream or Utility Stream</appLongName> ! </xsd:appinfo> ! </xsd:annotation> ! <xsd:complexType> ! <xsd:sequence> ! <xsd:element name="streamItem" type="Stream" minOccurs="0"> ! <xsd:annotation> ! <xsd:documentation>Stream detail. Derivable to uo:EnergyStream, uo:EnergyUtilityStream, uo:MaterialStream, uo:MaterialUtilityStream. ! </xsd:documentation> ! <xsd:appinfo> ! <appShortName>Stream</appShortName> ! <appLongName>Stream or Utility Stream</appLongName> ! </xsd:appinfo> ! </xsd:annotation> ! </xsd:element> ! <xsd:element ref="streamType" minOccurs="0"/> ! <xsd:element name="customStream" type="ext:Custom" minOccurs="0"/> ! </xsd:sequence> ! </xsd:complexType> ! </xsd:element> </xsd:sequence> <xsd:attributeGroup ref="ext:UsageContextAttributeGroup"/> --- 92,97 ---- <xsd:sequence> <xsd:element ref="etl:normalFlowDirection" minOccurs="0"/> ! <xsd:element ref="materialStream" minOccurs="0"/> ! <xsd:element ref="materialStreamType" minOccurs="0"/> </xsd:sequence> <xsd:attributeGroup ref="ext:UsageContextAttributeGroup"/> *************** *** 355,358 **** --- 309,324 ---- </xsd:annotation> <xsd:complexContent> + <xsd:extension base="MaterialStreamA"/> + </xsd:complexContent> + </xsd:complexType> + <xsd:complexType name="MaterialStreamA"> + <xsd:annotation> + <xsd:documentation>Material Stream (abstract type for substitution group elements)</xsd:documentation> + <xsd:appinfo> + <appShortName>Material stream</appShortName> + <appLongName>Material stream</appLongName> + </xsd:appinfo> + </xsd:annotation> + <xsd:complexContent> <xsd:extension base="Stream"> <xsd:sequence> *************** *** 406,410 **** <!-- --> ! <xsd:element name="materialUtilityStream" type="MaterialUtilityStream"> <xsd:annotation> <xsd:documentation>Utility stream</xsd:documentation> --- 372,376 ---- <!-- --> ! <xsd:element name="materialUtilityStream" type="MaterialUtilityStream" substitutionGroup="materialStream"> <xsd:annotation> <xsd:documentation>Utility stream</xsd:documentation> *************** *** 451,455 **** </xsd:complexType> <!-- ! --> <xsd:simpleType name="EPhaseHeatConditionChange"> --- 417,453 ---- </xsd:complexType> <!-- ! --> ! <xsd:simpleType name="EEnergyStreamType"> ! <xsd:annotation> ! <xsd:documentation>Energy stream type. Can use xsiTypeNS for the namespace.</xsd:documentation> ! <xsd:appinfo> ! <appShortName>Energy Stream</appShortName> ! <appLongName>Energy Stream or Utility Stream</appLongName> ! </xsd:appinfo> ! </xsd:annotation> ! <xsd:restriction base="xsd:string"> ! <xsd:enumeration value="EnergyStream"/> ! <xsd:enumeration value="EnergyUtilityStream"/> ! <xsd:enumeration value="custom"/> ! </xsd:restriction> ! </xsd:simpleType> ! <xsd:element name="energyStreamType"> ! <xsd:annotation> ! <xsd:documentation>Energy stream Type.</xsd:documentation> ! <xsd:appinfo> ! <appShortName>Energy Stream</appShortName> ! <appLongName>Energy Stream or Utility Stream</appLongName> ! </xsd:appinfo> ! </xsd:annotation> ! <xsd:complexType> ! <xsd:simpleContent> ! <xsd:extension base="EEnergyStreamType"> ! <xsd:attributeGroup ref="ext:BaseEnumerationAttributeGroup"/> ! <xsd:attribute name="xsiTypeNS" type="xsd:string" use="optional"/> ! </xsd:extension> ! </xsd:simpleContent> ! </xsd:complexType> ! </xsd:element> ! <!-- --> <xsd:simpleType name="EPhaseHeatConditionChange"> *************** *** 522,536 **** --> ! <xsd:simpleType name="EStreamType"> <xsd:annotation> ! <xsd:documentation>Stream Type. Used in xsi:type on streamItem. Use xsiTypeNS for the namespace.</xsd:documentation> <xsd:appinfo> ! <appShortName>Stream</appShortName> ! <appLongName>Stream or Utility Stream</appLongName> </xsd:appinfo> </xsd:annotation> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="EnergyStream"/> - <xsd:enumeration value="EnergyUtilityStream"/> <xsd:enumeration value="MaterialStream"/> <xsd:enumeration value="MaterialUtilityStream"/> --- 520,532 ---- --> ! <xsd:simpleType name="EMaterialStreamType"> <xsd:annotation> ! <xsd:documentation>Material stream type. Can use xsiTypeNS for the namespace.</xsd:documentation> <xsd:appinfo> ! <appShortName>Material Stream</appShortName> ! <appLongName>Material Stream or Utility Stream</appLongName> </xsd:appinfo> </xsd:annotation> <xsd:restriction base="xsd:string"> <xsd:enumeration value="MaterialStream"/> <xsd:enumeration value="MaterialUtilityStream"/> *************** *** 538,552 **** </xsd:restriction> </xsd:simpleType> ! <xsd:element name="streamType"> <xsd:annotation> ! <xsd:documentation>Stream Type. Used in xsi:type on streamItem. Use xsiTypeNS for the namespace.</xsd:documentation> <xsd:appinfo> ! <appShortName>Stream</appShortName> ! <appLongName>Stream or Utility Stream</appLongName> </xsd:appinfo> </xsd:annotation> <xsd:complexType> <xsd:simpleContent> ! <xsd:extension base="EStreamType"> <xsd:attributeGroup ref="ext:BaseEnumerationAttributeGroup"/> <xsd:attribute name="xsiTypeNS" type="xsd:string" use="optional"/> --- 534,548 ---- </xsd:restriction> </xsd:simpleType> ! <xsd:element name="materialStreamType"> <xsd:annotation> ! <xsd:documentation>Stream Type.</xsd:documentation> <xsd:appinfo> ! <appShortName>Material Stream</appShortName> ! <appLongName>Material Stream or Utility Stream</appLongName> </xsd:appinfo> </xsd:annotation> <xsd:complexType> <xsd:simpleContent> ! <xsd:extension base="EMaterialStreamType"> <xsd:attributeGroup ref="ext:BaseEnumerationAttributeGroup"/> <xsd:attribute name="xsiTypeNS" type="xsd:string" use="optional"/> |
