diff options
Diffstat (limited to 'TAO/CIAO/RACE')
19 files changed, 139 insertions, 139 deletions
diff --git a/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc index 6258cad826b..0da6e7b7ed5 100644 --- a/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc +++ b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc @@ -1,4 +1,4 @@ -// $Id$ +// $Id$ // This file is generated with "generate_component_mpc.pl -n Input_Adapter" project(Input_Adapter_stub): ciao_deployment_stub { diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl index d027b608c8b..e04bae9d80e 100644 --- a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl +++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl @@ -12,7 +12,7 @@ module CIAO component Interactive_Input_Adapter : Input_Adapter { }; - + home Interactive_Input_Adapter_Home manages Interactive_Input_Adapter { }; diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc index 5870d40d6b4..b675084bb96 100644 --- a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc +++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc @@ -82,14 +82,14 @@ project(Interactive_Input_Adapter_exec) : ciao_component_dnc, ciao_config_handle Input_Adapter_svnt \ Plan_Analyzer_Interface_stub \ XSC_Config_Handlers - + idlflags += -Sc \ -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_EXEC_Export \ -Wb,export_include=Interactive_Input_Adapter_exec_export.h dynamicflags = INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL IDL_Files { - + } Source_Files { diff --git a/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl b/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl index 6f0199494f5..7e672014026 100644 --- a/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl +++ b/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl @@ -13,6 +13,6 @@ module CIAO provides PlanEgress output; uses multiple PlanEgress adapters; }; - + }; }; diff --git a/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl b/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl index cd42287f4d2..ce75aa0bc05 100644 --- a/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl +++ b/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl @@ -9,7 +9,7 @@ module CIAO { - + module RACE { interface PlanEgress diff --git a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl index 818e1626111..20f29bcc1c8 100644 --- a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl +++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl @@ -11,7 +11,7 @@ module CIAO component XML_Output_Adapter : Output_Adapter { }; - + home XML_Output_Adapter_Home manages XML_Output_Adapter { }; diff --git a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc index fca465a75fd..981cd3d76f0 100644 --- a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc +++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc @@ -30,7 +30,7 @@ project(XML_Output_Adapter_svnt) : ciao_servant_dnc { Output_Adapter_svnt \ Output_Adapter_Interface_stub \ Output_Adapter_Interface_svnt - + idlflags += -Wb,export_macro=XML_OUTPUT_ADAPTER_SVNT_Export \ -Wb,export_include=XML_Output_Adapter_svnt_export.h dynamicflags = XML_OUTPUT_ADAPTER_SVNT_BUILD_DLL @@ -60,17 +60,17 @@ project(XML_Output_Adapter_exec) : ciao_component_dnc { Output_Adapter_svnt \ Output_Adapter_Interface_stub \ Output_Adapter_Interface_svnt - + idlflags += -Wb,export_macro=XML_OUTPUT_ADAPTER_EXEC_Export \ -Wb,export_include=XML_Output_Adapter_exec_export.h dynamicflags = XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL IDL_Files { - + } Source_Files { - + XML_Output_Adapter_exec.cpp } } diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl index 9f4fdd4668d..f2e3ab26f66 100644 --- a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl +++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl @@ -8,7 +8,7 @@ module CIAO { - + module RACE { component Plan_Analyzer diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc index 3ea12c0608e..7cb588e74c0 100644 --- a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc +++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc @@ -94,7 +94,7 @@ project(Plan_Analyzer_exec) : ciao_component_dnc { dynamicflags = PLAN_ANALYZER_EXEC_BUILD_DLL IDL_Files { - + } Source_Files { diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl index dcf42d8218c..98b02691a32 100644 --- a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl +++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl @@ -13,7 +13,7 @@ module CIAO { module RACE { - + composition session Planner_Manager_Impl { home executor Planner_Manager_Home_Exec diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc index 673c8647431..46dee1a6480 100644 --- a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc +++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc @@ -90,14 +90,14 @@ project(Planner_Manager_exec) : ciao_component_dnc { Planner_Interface_stub \ Planner_stub \ Output_Adapter_Interface_stub - + idlflags += -Sc \ -Wb,export_macro=PLANNER_MANAGER_EXEC_Export \ -Wb,export_include=Planner_Manager_exec_export.h dynamicflags = PLANNER_MANAGER_EXEC_BUILD_DLL IDL_Files { - + } Source_Files { diff --git a/TAO/CIAO/RACE/Planners/Base/Planner.idl b/TAO/CIAO/RACE/Planners/Base/Planner.idl index ae81074d5e7..5fc58c5cc1c 100644 --- a/TAO/CIAO/RACE/Planners/Base/Planner.idl +++ b/TAO/CIAO/RACE/Planners/Base/Planner.idl @@ -8,7 +8,7 @@ module CIAO { - + module RACE { component Planner @@ -18,7 +18,7 @@ module CIAO attribute RACE_Classification type; }; }; - + }; #endif /* RACE_PLANNER_IDL */ diff --git a/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl b/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl index b947c132540..8c8fc9a6194 100644 --- a/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl +++ b/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl @@ -9,7 +9,7 @@ module CIAO { - + module RACE { interface Planner_I diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl index bb1a67e4a79..5678d1d21fc 100644 --- a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl +++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl @@ -13,7 +13,7 @@ module CIAO component SimpleBinPacker : Planner { }; - + home SimpleBinPacker_Home manages SimpleBinPacker { }; diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc index 8e69a6d96a7..8d504bad06f 100644 --- a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc +++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc @@ -83,16 +83,16 @@ project(SimpleBinPacker_exec) : ciao_component_dnc { Planner_Interface_stub \ Planner_Interface_svnt \ Planner_stub \ - Planner_svnt \ + Planner_svnt \ RACE_common_stub - + idlflags += -Sc \ -Wb,export_macro=SIMPLEBINPACKER_EXEC_Export \ -Wb,export_include=SimpleBinPacker_exec_export.h dynamicflags = SIMPLEBINPACKER_EXEC_BUILD_DLL IDL_Files { - + } Source_Files { diff --git a/TAO/CIAO/RACE/common/RACE_common.idl b/TAO/CIAO/RACE/common/RACE_common.idl index f5b1d9e59d8..3aa05fb6681 100644 --- a/TAO/CIAO/RACE/common/RACE_common.idl +++ b/TAO/CIAO/RACE/common/RACE_common.idl @@ -3,7 +3,7 @@ #define RACE_COMMON_IDL module CIAO -{ +{ module RACE { typedef string RACE_Classification; diff --git a/TAO/CIAO/RACE/descriptors/Deployment.xsd b/TAO/CIAO/RACE/descriptors/Deployment.xsd index c8a6399730b..7743791b54e 100644 --- a/TAO/CIAO/RACE/descriptors/Deployment.xsd +++ b/TAO/CIAO/RACE/descriptors/Deployment.xsd @@ -10,7 +10,7 @@ <xsd:complexType name="Any"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="value" type="Deployment:DataValue"/> + <xsd:element name="value" type="Deployment:DataValue"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -28,7 +28,7 @@ <xsd:element name="alias" type="Deployment:AliasType"/> <xsd:element name="struct" type="Deployment:StructType"/> <xsd:element name="value" type="Deployment:ValueType"/> - <xsd:element name="union" type="Deployment:UnionType"/> + <xsd:element name="union" type="Deployment:UnionType"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -58,7 +58,7 @@ <xsd:element name="discriminator" type="Deployment:DataValue"/> <xsd:element name="value" type="Deployment:DataValue"/> <xsd:element name="boxedValue" type="Deployment:DataValue"/> - <xsd:element name="member" type="Deployment:NamedValue"/> + <xsd:element name="member" type="Deployment:NamedValue"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -70,7 +70,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="xsd:string"/> + <xsd:element name="member" type="xsd:string"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -79,7 +79,7 @@ <xsd:complexType name="ObjrefType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> + <xsd:element name="typeId" type="xsd:string"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -89,7 +89,7 @@ <xsd:element name="ObjrefType" type="Deployment:ObjrefType"/> <xsd:complexType name="BoundedStringType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> + <xsd:element name="bound" type="xsd:string"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -98,7 +98,7 @@ <xsd:complexType name="FixedType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="digits" type="xsd:string"/> - <xsd:element name="scale" type="xsd:string"/> + <xsd:element name="scale" type="xsd:string"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -107,7 +107,7 @@ <xsd:complexType name="ArrayType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="length" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> + <xsd:element name="elementType" type="Deployment:DataType"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -116,7 +116,7 @@ <xsd:complexType name="SequenceType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="bound" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> + <xsd:element name="elementType" type="Deployment:DataType"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -126,7 +126,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> + <xsd:element name="elementType" type="Deployment:DataType"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -136,7 +136,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="Deployment:StructMemberType"/> + <xsd:element name="member" type="Deployment:StructMemberType"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -145,7 +145,7 @@ <xsd:complexType name="StructMemberType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> + <xsd:element name="type" type="Deployment:DataType"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -157,7 +157,7 @@ <xsd:element name="typeId" type="xsd:string"/> <xsd:element name="modifier" type="xsd:string"/> <xsd:element name="baseType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:ValueMemberType"/> + <xsd:element name="member" type="Deployment:ValueMemberType"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -167,7 +167,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="visibility" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> + <xsd:element name="type" type="Deployment:DataType"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -179,7 +179,7 @@ <xsd:element name="typeId" type="xsd:string"/> <xsd:element name="default" type="Deployment:UnionMemberType"/> <xsd:element name="discriminatorType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:UnionMemberType"/> + <xsd:element name="member" type="Deployment:UnionMemberType"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -189,7 +189,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="label" type="Deployment:DataValue"/> + <xsd:element name="label" type="Deployment:DataValue"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -198,7 +198,7 @@ <xsd:complexType name="NamedValue"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:DataValue"/> + <xsd:element name="value" type="Deployment:DataValue"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -209,7 +209,7 @@ <xsd:element name="name" type="xsd:string"/> <xsd:element name="label" type="xsd:string"/> <xsd:element name="connect" type="Deployment:Interconnect"/> - <xsd:element name="resource" type="Deployment:Resource"/> + <xsd:element name="resource" type="Deployment:Resource"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -221,7 +221,7 @@ <xsd:element name="label" type="xsd:string"/> <xsd:element name="connection" type="Deployment:Bridge"/> <xsd:element name="connect" type="Deployment:Node"/> - <xsd:element name="resource" type="Deployment:Resource"/> + <xsd:element name="resource" type="Deployment:Resource"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -233,7 +233,7 @@ <xsd:element name="label" type="xsd:string"/> <xsd:element name="connection" type="Deployment:Interconnect"/> <xsd:element name="sharedResource" type="Deployment:SharedResource"/> - <xsd:element name="resource" type="Deployment:Resource"/> + <xsd:element name="resource" type="Deployment:Resource"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -254,7 +254,7 @@ <xsd:element name="name" type="xsd:string"/> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> + <xsd:element name="property" type="Deployment:SatisfierProperty"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -262,13 +262,13 @@ <xsd:element name="SharedResource" type="Deployment:SharedResource"/> <xsd:complexType name="Domain"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="UUID" type="xsd:string"/> + <xsd:element name="UUID" type="xsd:string"/> <xsd:element name="label" type="xsd:string"/> <xsd:element name="sharedResource" type="Deployment:SharedResource"/> <xsd:element name="node" type="Deployment:Node"/> <xsd:element name="interconnect" type="Deployment:Interconnect"/> <xsd:element name="bridge" type="Deployment:Bridge"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> + <xsd:element name="infoProperty" type="Deployment:Property"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -279,7 +279,7 @@ <xsd:element name="name" type="xsd:string"/> <xsd:element name="source" type="xsd:string"/> <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/> + <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -288,7 +288,7 @@ <xsd:complexType name="PlanSubcomponentPropertyReference"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> + <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -299,7 +299,7 @@ <xsd:element name="portName" type="xsd:string"/> <xsd:element name="provider" type="xsd:string"/> <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> + <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -313,7 +313,7 @@ <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/> <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> - <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/> + <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -327,7 +327,7 @@ <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/> <xsd:element name="configProperty" type="Deployment:Property"/> <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/> + <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -339,7 +339,7 @@ <xsd:element name="source" type="xsd:string"/> <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/> <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> + <xsd:element name="deployRequirement" type="Deployment:Requirement"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -353,7 +353,7 @@ <xsd:element name="source" type="xsd:string"/> <xsd:element name="execParameter" type="Deployment:Property"/> <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/> + <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -372,7 +372,7 @@ <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/> <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/> <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> + <xsd:element name="infoProperty" type="Deployment:Property"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -384,7 +384,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="resourceValue" type="Deployment:Any"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -395,7 +395,7 @@ <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="resourceValue" type="Deployment:Any"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -406,7 +406,7 @@ <xsd:element name="targetName" type="xsd:string"/> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="resourceValue" type="Deployment:Any"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -416,7 +416,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> + <xsd:element name="property" type="Deployment:SatisfierProperty"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -425,7 +425,7 @@ <xsd:complexType name="ComponentPropertyDescription"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> + <xsd:element name="type" type="Deployment:DataType"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -440,7 +440,7 @@ <xsd:element name="exclusiveProvider" type="xsd:string"/> <xsd:element name="exclusiveUser" type="xsd:string"/> <xsd:element name="optional" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> + <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -456,7 +456,7 @@ <xsd:element name="configProperty" type="Deployment:Property"/> <xsd:element name="port" type="Deployment:ComponentPortDescription"/> <xsd:element name="property" type="Deployment:ComponentPropertyDescription"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> + <xsd:element name="infoProperty" type="Deployment:Property"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -470,7 +470,7 @@ <xsd:element name="execParameter" type="Deployment:Property"/> <xsd:element name="deployRequirement" type="Deployment:Requirement"/> <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> + <xsd:element name="infoProperty" type="Deployment:Property"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -480,7 +480,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="execParameter" type="Deployment:Property"/> <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact"/> - <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/> + <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -490,7 +490,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/> + <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -499,7 +499,7 @@ <xsd:complexType name="SubcomponentPropertyReference"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> + <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -508,7 +508,7 @@ <xsd:complexType name="SubcomponentPortEndpoint"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="portName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> + <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -520,7 +520,7 @@ <xsd:element name="deployRequirement" type="Deployment:Requirement"/> <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint"/> - <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> + <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -532,7 +532,7 @@ <xsd:element name="package" type="Deployment:ComponentPackageDescription"/> <xsd:element name="configProperty" type="Deployment:Property"/> <xsd:element name="selectRequirement" type="Deployment:Requirement"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> + <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -542,7 +542,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription"/> - <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/> + <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -558,7 +558,7 @@ <xsd:element name="configProperty" type="Deployment:Property"/> <xsd:element name="capability" type="Deployment:Capability"/> <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> + <xsd:element name="infoProperty" type="Deployment:Property"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -568,7 +568,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="requiredUUID" type="xsd:string"/> <xsd:element name="requiredName" type="xsd:string"/> - <xsd:element name="requiredType" type="xsd:string"/> + <xsd:element name="requiredType" type="xsd:string"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -581,7 +581,7 @@ <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/> <xsd:element name="configProperty" type="Deployment:Property"/> <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> + <xsd:element name="infoProperty" type="Deployment:Property"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -595,7 +595,7 @@ <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/> <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> <xsd:element name="selectRequirement" type="Deployment:Requirement"/> - <xsd:element name="configProperty" type="Deployment:Property"/> + <xsd:element name="configProperty" type="Deployment:Property"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -604,7 +604,7 @@ <xsd:complexType name="PackagedComponentImplementation"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/> + <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -613,7 +613,7 @@ <xsd:complexType name="NamedImplementationArtifact"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/> + <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -626,7 +626,7 @@ <xsd:element name="componentPort" type="xsd:string"/> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> + <xsd:element name="property" type="Deployment:Property"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -636,7 +636,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> + <xsd:element name="property" type="Deployment:SatisfierProperty"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -646,7 +646,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/> - <xsd:element name="value" type="Deployment:Any"/> + <xsd:element name="value" type="Deployment:Any"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -656,7 +656,7 @@ <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> + <xsd:element name="property" type="Deployment:Property"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -665,7 +665,7 @@ <xsd:complexType name="Property"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:Any"/> + <xsd:element name="value" type="Deployment:Any"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -673,7 +673,7 @@ <xsd:element name="Property" type="Deployment:Property"/> <xsd:complexType name="ExternalReferenceEndpoint"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="location" type="xsd:string"/> + <xsd:element name="location" type="xsd:string"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -681,7 +681,7 @@ <xsd:element name="ExternalReferenceEndpoint" type="Deployment:ExternalReferenceEndpoint"/> <xsd:complexType name="ComponentExternalPortEndpoint"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> + <xsd:element name="portName" type="xsd:string"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -689,7 +689,7 @@ <xsd:element name="ComponentExternalPortEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> <xsd:complexType name="ImplementationDependency"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requiredType" type="xsd:string"/> + <xsd:element name="requiredType" type="xsd:string"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> @@ -697,7 +697,7 @@ <xsd:element name="ImplementationDependency" type="Deployment:ImplementationDependency"/> <xsd:complexType name="TopLevelPackageDescription"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="package" type="Deployment:PackageConfiguration"/> + <xsd:element name="package" type="Deployment:PackageConfiguration"/> </xsd:choice> <xsd:attribute ref="xmi:id" use="optional"/> <xsd:attributeGroup ref="xmi:ObjectAttribs"/> diff --git a/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd b/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd index b73077b0980..5c35bd669db 100644 --- a/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd +++ b/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd @@ -50,7 +50,7 @@ <xsd:complexType name="DataType"> <xsd:choice> <xsd:element name="kind" type="Deployment:TCKind"/> -<!-- +<!-- @@ not used, what for? <xsd:element name="enum" type="Deployment:EnumType"/> @@ -109,7 +109,7 @@ <xsd:complexType name="Any"> <xsd:sequence> <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="value" type="Deployment:DataValue"/> + <xsd:element name="value" type="Deployment:DataValue"/> </xsd:sequence> </xsd:complexType> @@ -117,13 +117,13 @@ <xsd:complexType name="Property"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:Any"/> + <xsd:element name="value" type="Deployment:Any"/> </xsd:sequence> </xsd:complexType> <!-- End of base definitions. --> - + <xsd:complexType name="Node"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -132,7 +132,7 @@ @@ recursive, not used <xsd:element name="connection" type="Deployment:Interconnect"/> <xsd:element name="sharedResource" type="Deployment:SharedResource"/> - <xsd:element name="resource" type="Deployment:Resource"/> + <xsd:element name="resource" type="Deployment:Resource"/> --> </xsd:sequence> </xsd:complexType> @@ -154,7 +154,7 @@ <xsd:sequence> <xsd:element name="name" type="xsd:string"/> <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/> - <xsd:element name="value" type="Deployment:Any"/> + <xsd:element name="value" type="Deployment:Any"/> </xsd:sequence> </xsd:complexType> @@ -173,7 +173,7 @@ <xsd:element name="name" type="xsd:string"/> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> + <xsd:element name="property" type="Deployment:SatisfierProperty"/> </xsd:sequence> </xsd:complexType> @@ -181,7 +181,7 @@ <xsd:complexType name="Domain"> <xsd:sequence> <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> + <xsd:element name="UUID" type="xsd:string"/> <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0"/> <xsd:element name="node" type="Deployment:Node" maxOccurs="unbounded"/> <!-- @@ -198,7 +198,7 @@ <xsd:sequence> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> + <xsd:element name="property" type="Deployment:Property"/> </xsd:sequence> </xsd:complexType> @@ -209,7 +209,7 @@ <xsd:sequence> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="resourceValue" type="Deployment:Any"/> </xsd:sequence> </xsd:complexType> @@ -255,7 +255,7 @@ <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="resourceValue" type="Deployment:Any"/> </xsd:sequence> </xsd:complexType> @@ -328,7 +328,7 @@ <xsd:complexType name="ComponentExternalPortEndpoint"> <xsd:sequence> - <xsd:element name="portName" type="xsd:string"/> + <xsd:element name="portName" type="xsd:string"/> </xsd:sequence> </xsd:complexType> @@ -345,7 +345,7 @@ <xsd:complexType name="ExternalReferenceEndpoint"> <xsd:sequence> - <xsd:element name="location" type="xsd:string"/> + <xsd:element name="location" type="xsd:string"/> </xsd:sequence> </xsd:complexType> @@ -355,7 +355,7 @@ <xsd:element name="targetName" type="xsd:string"/> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="resourceValue" type="Deployment:Any"/> </xsd:sequence> </xsd:complexType> @@ -375,7 +375,7 @@ <xsd:complexType name="ImplementationDependency"> <xsd:sequence> - <xsd:element name="requiredType" type="xsd:string"/> + <xsd:element name="requiredType" type="xsd:string"/> </xsd:sequence> </xsd:complexType> @@ -383,8 +383,8 @@ <xsd:complexType name="DeploymentPlan"> <xsd:sequence> <xsd:element name="label" type="xsd:string" minOccurs="0"/> - <xsd:element name="UUID" type="xsd:string" minOccurs="0"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" maxOccurs="1"/> + <xsd:element name="UUID" type="xsd:string" minOccurs="0"/> + <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" maxOccurs="1"/> <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded" /> <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/> @@ -396,7 +396,7 @@ <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> - + @@ -407,14 +407,14 @@ <xsd:sequence> <xsd:element name="name" type="xsd:string"/> <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> + <xsd:element name="property" type="Deployment:SatisfierProperty"/> </xsd:sequence> </xsd:complexType> <xsd:complexType name="NamedImplementationArtifact"> <xsd:sequence> - <xsd:element name="name" type="xsd:string"/> + <xsd:element name="name" type="xsd:string"/> <!-- @@ recursive NIA->IAD->NIA --> <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/> </xsd:sequence> @@ -432,7 +432,7 @@ <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/> <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/> <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> </xsd:sequence> <xsd:element name="contentLocation" type="xsd:string"/> </xsd:choice> @@ -446,7 +446,7 @@ <xsd:element name="componentPort" type="xsd:string"/> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> + <xsd:element name="property" type="Deployment:Property"/> </xsd:sequence> </xsd:complexType> @@ -463,7 +463,7 @@ <xsd:complexType name="PackagedComponentImplementation"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <!-- @@ recursive CPD->PCI->CID->CAD->SID->CPD --> + <!-- @@ recursive CPD->PCI->CID->CAD->SID->CPD --> <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/> </xsd:sequence> </xsd:complexType> @@ -477,7 +477,7 @@ <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/> <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/> <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> </xsd:sequence> <xsd:element name="contentLocation" type="xsd:string"/> </xsd:choice> @@ -488,7 +488,7 @@ <xsd:sequence> <xsd:element name="requiredUUID" type="xsd:string"/> <xsd:element name="requiredName" type="xsd:string"/> - <xsd:element name="requiredType" type="xsd:string"/> + <xsd:element name="requiredType" type="xsd:string"/> </xsd:sequence> </xsd:complexType> @@ -536,7 +536,7 @@ <xsd:sequence> <xsd:element name="name" type="xsd:string"/> <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/> + <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/> </xsd:sequence> </xsd:complexType> @@ -545,7 +545,7 @@ <xsd:sequence> <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription" maxOccurs="unbounded"/> <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" maxOccurs="unbounded"/> - <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0"/> + <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0"/> </xsd:sequence> </xsd:complexType> @@ -563,7 +563,7 @@ <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/> <xsd:element name="capability" type="Deployment:Capability" minOccurs="0"/> <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0"/> - <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> </xsd:sequence> <xsd:element name="contentLocation" type="xsd:string"/> </xsd:choice> @@ -614,7 +614,7 @@ -<!-- VAULT +<!-- VAULT Place for strange things. Nobody knows what they are for... @@ -633,14 +633,14 @@ Place for strange things. Nobody knows what they are for... <xsd:complexType name="ObjrefType"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> + <xsd:element name="typeId" type="xsd:string"/> </xsd:sequence> </xsd:complexType> <xsd:complexType name="BoundedStringType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> + <xsd:element name="bound" type="xsd:string"/> </xsd:choice> </xsd:complexType> @@ -648,7 +648,7 @@ Place for strange things. Nobody knows what they are for... <xsd:complexType name="FixedType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="digits" type="xsd:string"/> - <xsd:element name="scale" type="xsd:string"/> + <xsd:element name="scale" type="xsd:string"/> </xsd:choice> </xsd:complexType> @@ -656,14 +656,14 @@ Place for strange things. Nobody knows what they are for... <xsd:complexType name="ArrayType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="length" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> + <xsd:element name="elementType" type="Deployment:DataType"/> </xsd:choice> </xsd:complexType> <xsd:complexType name="SequenceType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="bound" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> + <xsd:element name="elementType" type="Deployment:DataType"/> </xsd:choice> </xsd:complexType> @@ -671,7 +671,7 @@ Place for strange things. Nobody knows what they are for... <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> + <xsd:element name="elementType" type="Deployment:DataType"/> </xsd:choice> </xsd:complexType> @@ -679,14 +679,14 @@ Place for strange things. Nobody knows what they are for... <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="Deployment:StructMemberType"/> + <xsd:element name="member" type="Deployment:StructMemberType"/> </xsd:choice> </xsd:complexType> <xsd:complexType name="StructMemberType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> + <xsd:element name="type" type="Deployment:DataType"/> </xsd:choice> </xsd:complexType> @@ -696,7 +696,7 @@ Place for strange things. Nobody knows what they are for... <xsd:element name="typeId" type="xsd:string"/> <xsd:element name="modifier" type="xsd:string"/> <xsd:element name="baseType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:ValueMemberType"/> + <xsd:element name="member" type="Deployment:ValueMemberType"/> </xsd:choice> </xsd:complexType> @@ -704,7 +704,7 @@ Place for strange things. Nobody knows what they are for... <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="visibility" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> + <xsd:element name="type" type="Deployment:DataType"/> </xsd:choice> </xsd:complexType> @@ -714,7 +714,7 @@ Place for strange things. Nobody knows what they are for... <xsd:element name="typeId" type="xsd:string"/> <xsd:element name="default" type="Deployment:UnionMemberType"/> <xsd:element name="discriminatorType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:UnionMemberType"/> + <xsd:element name="member" type="Deployment:UnionMemberType"/> </xsd:choice> </xsd:complexType> @@ -722,7 +722,7 @@ Place for strange things. Nobody knows what they are for... <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="label" type="Deployment:DataValue"/> + <xsd:element name="label" type="Deployment:DataValue"/> </xsd:choice> </xsd:complexType> @@ -730,7 +730,7 @@ Place for strange things. Nobody knows what they are for... <xsd:complexType name="NamedValue"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:DataValue"/> + <xsd:element name="value" type="Deployment:DataValue"/> </xsd:choice> </xsd:complexType> @@ -740,7 +740,7 @@ Place for strange things. Nobody knows what they are for... <xsd:element name="name" type="xsd:string"/> <xsd:element name="label" type="xsd:string"/> <xsd:element name="connect" type="Deployment:Interconnect"/> - <xsd:element name="resource" type="Deployment:Resource"/> + <xsd:element name="resource" type="Deployment:Resource"/> </xsd:sequence> </xsd:complexType> @@ -750,7 +750,7 @@ Place for strange things. Nobody knows what they are for... <xsd:element name="label" type="xsd:string"/> <xsd:element name="connection" type="Deployment:Bridge"/> <xsd:element name="connect" type="Deployment:Node"/> - <xsd:element name="resource" type="Deployment:Resource"/> + <xsd:element name="resource" type="Deployment:Resource"/> </xsd:choice> </xsd:complexType> @@ -775,13 +775,13 @@ Place for strange things. Nobody knows what they are for... <!-- - This type is not referenced anywhere. + This type is not referenced anywhere. <xsd:complexType name="RequirementSatisfier"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> + <xsd:element name="property" type="Deployment:SatisfierProperty"/> </xsd:choice> </xsd:complexType> diff --git a/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp index 0648c10eab8..aedb507930e 100644 --- a/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp +++ b/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp @@ -10,7 +10,7 @@ <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>deployment_stage_port</name> <specificType>IDL:RACE/deployment_stage:1.0</specificType> @@ -22,7 +22,7 @@ <kind>SimplexReceptacle</kind> </port> </realizes> - + <implementation id="RACE-Interactive_Input_Adapter-mdd"> <name>RACE-Interactive_Input_Adapter-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -191,7 +191,7 @@ </value> </execParameter> </artifact> - + <artifact id="RACE-Interactive_Input_Adapter_svnt"> <name>Interactive_Input_Adapter_svnt</name> <source><!-- @@ Not sure --></source> @@ -228,7 +228,7 @@ </value> </execParameter> </artifact> - + <artifact id="RACE-Plan_Analyzer_svnt"> <name>Plan_Analyzer_svnt</name> <source><!-- @@ Not sure --></source> @@ -265,7 +265,7 @@ </value> </execParameter> </artifact> - + <artifact id="RACE-Planner_Manager_svnt"> <name>Planner_Manager_svnt</name> <source><!-- @@ Not sure --></source> @@ -302,7 +302,7 @@ </value> </execParameter> </artifact> - + <artifact id="RACE-SimpleBinPacker_svnt"> <name>SimpleBinPacker_svnt</name> <source><!-- @@ Not sure --></source> @@ -339,7 +339,7 @@ </value> </execParameter> </artifact> - + <artifact id="RACE-XML_Output_Adapter_svnt"> <name>XML_Output_Adapter_svnt</name> <source><!-- @@ Not sure --></source> @@ -358,4 +358,4 @@ </execParameter> </artifact> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> |