24 files changed, 0 insertions, 4060 deletions

diff --git a/CIAO/docs/schema/Basic_Deployment_Data.xsd b/CIAO/docs/schema/Basic_Deployment_Data.xsd
deleted file mode 100644
index 025b4d8631d..00000000000
--- a/CIAO/docs/schema/Basic_Deployment_Data.xsd
+++ /dev/null
@@ -1,427 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            xmlns:xmi="http://www.omg.org/XMI"
-            targetNamespace="http://www.omg.org/Deployment">
-
-  <xsd:import namespace="http://www.omg.org/XMI"
-              schemaLocation="XMI.xsd" />
-  
-  <xsd:complexType name="IdRef">
-    <xsd:attributeGroup ref="xmi:LinkAttribs" />
-  </xsd:complexType>
-
-  <xsd:simpleType name="TCKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="tk_null"/>
-      <xsd:enumeration value="tk_void"/>
-      <xsd:enumeration value="tk_short"/>
-      <xsd:enumeration value="tk_long"/>
-      <xsd:enumeration value="tk_ushort"/>
-      <xsd:enumeration value="tk_ulong"/>
-      <xsd:enumeration value="tk_float"/>
-      <xsd:enumeration value="tk_double"/>
-      <xsd:enumeration value="tk_boolean"/>
-      <xsd:enumeration value="tk_char"/>
-      <xsd:enumeration value="tk_octet"/>
-      <xsd:enumeration value="tk_any"/>
-      <xsd:enumeration value="tk_TypeCode"/>
-      <xsd:enumeration value="tk_Principal"/>
-      <xsd:enumeration value="tk_objref"/>
-      <xsd:enumeration value="tk_struct"/>
-      <xsd:enumeration value="tk_union"/>
-      <xsd:enumeration value="tk_enum"/>
-      <xsd:enumeration value="tk_string"/>
-      <xsd:enumeration value="tk_sequence"/>
-      <xsd:enumeration value="tk_array"/>
-      <xsd:enumeration value="tk_alias"/>
-      <xsd:enumeration value="tk_except"/>
-      <xsd:enumeration value="tk_longlong"/>
-      <xsd:enumeration value="tk_ulonglong"/>
-      <xsd:enumeration value="tk_longdouble"/>
-      <xsd:enumeration value="tk_wchar"/>
-      <xsd:enumeration value="tk_wstring"/>
-      <xsd:enumeration value="tk_wfixed"/>
-      <xsd:enumeration value="tk_value"/>
-      <xsd:enumeration value="tk_value_box"/>
-      <xsd:enumeration value="tk_native"/>
-      <xsd:enumeration value="tk_abstract_interface"/>
-      <xsd:enumeration value="tk_local_interface"/>
-      <xsd:enumeration value="tk_component"/>
-      <xsd:enumeration value="tk_home"/>
-      <xsd:enumeration value="tk_event"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="DataType">
-    <xsd:sequence>
-      <xsd:element name="kind" type="Deployment:TCKind"/>
-      <xsd:choice minOccurs="0">
-        <xsd:element name="enum" type="Deployment:EnumType" />
-        <xsd:element name="struct" type="Deployment:StructType"/>
-        <xsd:element name="value" type="Deployment:ValueType"/>
-        <xsd:element name="sequence" type="Deployment:SequenceType"/>
-        <xsd:element name="alias" type="Deployment:AliasType"/>
-       </xsd:choice>
-
-<!--
-@@ not supported now..
-
-      <xsd:element name="objref" type="Deployment:ObjrefType"/>
-      <xsd:element name="boundedString" type="Deployment:BoundedStringType"/>
-      <xsd:element name="fixed" type="Deployment:FixedType"/>
-      <xsd:element name="array" type="Deployment:ArrayType"/>
-
-      <xsd:element name="union" type="Deployment:UnionType"/>
--->
-    </xsd:sequence>
-    <xsd:attribute ref="xmi:id" />
-  </xsd:complexType>
-
-  <xsd:complexType name="DataValue">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="short" type="xsd:short"/>
-      <xsd:element name="long" type="xsd:int"/>
-      <xsd:element name="ushort" type="xsd:unsignedShort"/>
-      <xsd:element name="ulong" type="xsd:unsignedInt"/>
-      <xsd:element name="float" type="xsd:float"/>
-      <xsd:element name="double" type="xsd:double"/>
-      <xsd:element name="boolean" type="xsd:boolean"/>
-      <xsd:element name="octet" type="xsd:unsignedByte"/>
-      <!-- xsd:element name="opaque" type="xsd:base64Binary"/ -->
-      <!-- <xsd:element name="objref" type="xsd:string"/> -->
-      <xsd:element name="enum" type="xsd:string"/>
-      <xsd:element name="string" type="xsd:string"/>
-      <xsd:element name="longlong" type="xsd:long"/>
-      <xsd:element name="ulonglong" type="xsd:unsignedLong"/>
-      <xsd:element name="longdouble" type="xsd:double"/>
-      <!-- <xsd:element name="fixed" type="xsd:string"/> -->
-      <!-- <xsd:element name="any" type="Deployment:Any"/> -->
-      <!-- <xsd:element name="typecode" type="Deployment:DataType"/> -->
-      <xsd:element name="element" type="Deployment:DataValue"/>
-      <!-- <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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="AliasType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="EnumType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="xsd:string" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="StructType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="Deployment:StructMemberType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="StructMemberType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ValueType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <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" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ValueMemberType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="visibility" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="NamedValue">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="SequenceType">
-    <xsd:sequence>
-      <xsd:element name="bound" type="xsd:unsignedInt" minOccurs="0" />
-      <xsd:element name="elementType" type="Deployment:DataType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="Any">
-    <xsd:sequence>
-      <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="Property">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:Any"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- End of base definitions. -->
-
-  <xsd:simpleType name="SatisfierPropertyKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="Quantity"/>
-      <xsd:enumeration value="Capacity"/>
-      <xsd:enumeration value="Minimum"/>
-      <xsd:enumeration value="Maximum"/>
-      <xsd:enumeration value="Attribute"/>
-      <xsd:enumeration value="Selection"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="SatisfierProperty">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/>
-      <xsd:element name="dynamic" type="xsd:boolean" />
-      <xsd:element name="value" type="Deployment:Any"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="Resource">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string" maxOccurs="unbounded" />
-      <xsd:element name="property" type="Deployment:SatisfierProperty" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="Requirement">
-    <xsd:sequence>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- Deployment -->
-
-  <xsd:complexType name="ResourceDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="requirementName" type="xsd:string"/>
-      <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ArtifactDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="node" type="xsd:string" />
-      <xsd:element name="location" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute ref="xmi:id" />
-  </xsd:complexType>
-
-  <xsd:complexType name="MonolithicDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="artifact" type="Deployment:IdRef" minOccurs="0" maxOccurs="unbounded"/> <!-- ArtifactDeploymentDescription -->
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute ref="xmi:id" />
-  </xsd:complexType>
-
-  <xsd:simpleType name="ResourceUsageKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="None"/>
-      <xsd:enumeration value="InstanceUsesResource"/>
-      <xsd:enumeration value="ResourceUsesInstance"/>
-      <xsd:enumeration value="PortUsesResource"/>
-      <xsd:enumeration value="ResourceUsesPort"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="InstanceResourceDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
-      <xsd:element name="requirementName" type="xsd:string"/>
-      <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="InstanceDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="implementation" type="Deployment:IdRef"/> <!-- MonolithicDeploymentDescription -->
-      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute ref="xmi:id" />
-  </xsd:complexType>
-
-  <xsd:simpleType name="CCMComponentPortKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="Facet"/>
-      <xsd:enumeration value="SimplexReceptacle"/>
-      <xsd:enumeration value="MultiplexReceptacle"/>
-      <xsd:enumeration value="EventEmitter"/>
-      <xsd:enumeration value="EventPublisher"/>
-      <xsd:enumeration value="EventConsumer"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="ComponentPortDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <!-- @@MAJO:  Hack - specific/supported types should be required. -->
-      <xsd:element name="specificType" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="supportedType" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="provider" type="xsd:boolean"/>
-      <xsd:element name="exclusiveProvider" type="xsd:boolean"/>
-      <xsd:element name="exclusiveUser" type="xsd:boolean"/>
-      <xsd:element name="optional" type="xsd:boolean"/>
-      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ComponentPropertyDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ComponentExternalPortEndpoint">
-    <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="PlanSubcomponentPortEndpoint">
-    <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>
-      <xsd:element name="provider" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
-      <xsd:element name="instance" type="Deployment:IdRef"/> <!-- InstanceDeploymentDescription -->
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ExternalReferenceEndpoint">
-    <xsd:sequence>
-      <xsd:element name="location" type="xsd:string"/>
-      <xsd:element name="provider" type="xsd:boolean"/>
-      <xsd:element name="portName" type="xsd:string" minOccurs="0" />
-      <xsd:element name="supportedType" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ConnectionResourceDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="targetName" type="xsd:string"/>
-      <xsd:element name="requirementName" type="xsd:string"/>
-      <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="PlanConnectionDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ImplementationDependency">
-    <xsd:sequence>
-      <xsd:element name="requiredType" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- Implementation -->
-
-  <xsd:complexType name="Capability">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="property" type="Deployment:SatisfierProperty" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ImplementationRequirement">
-    <xsd:sequence>
-      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind" minOccurs="0"/>
-      <xsd:element name="resourcePort" type="xsd:string" minOccurs="0" />
-      <xsd:element name="componentPort" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="SubcomponentPortEndpoint">
-    <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:IdRef"/> <!-- SubcomponentInstantiationDescription -->
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="AssemblyConnectionDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:simpleType name="PlanLocalityKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="SameProcess"/>
-      <xsd:enumeration value="DifferentProcess"/>
-      <xsd:enumeration value="NoConstraint"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="PlanLocality">
-    <xsd:sequence>
-      <xsd:element name="constraint" type="Deployment:PlanLocalityKind"/>
-      <xsd:element name="constrainedInstance" type="Deployment:IdRef"/> <!-- InstanceDeploymentDescription -->
-    </xsd:sequence>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/CIAO/docs/schema/CIAOEvents.xsd b/CIAO/docs/schema/CIAOEvents.xsd
deleted file mode 100644
index 645d7a6e530..00000000000
--- a/CIAO/docs/schema/CIAOEvents.xsd
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema targetNamespace="http://www.dre.vanderbilt.edu/CIAOEvents"
-            xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            attributeFormDefault="unqualified">
-
-  <xsd:element name="CIAOEvents" type="CIAO:CIAOEventsDef">
-    <xsd:annotation>
-      <xsd:documentation>
-        Root element for defining all the pub/sub services configuration 
-        used by a DeploymentPlan.  
-        A CIAO:Events document should reside in a separate file.  
-        A DeploymentPlan can refer to one or more CIAO:Events file names
-        using the "infoProperty" tag.  
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
-
-<!-- =============================================================== -->
-<!--            CIAO Event Service Deployment Description            -->
-<!-- =============================================================== -->
-
-  <xsd:simpleType name="EventServiceType">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="EC"/>
-      <xsd:enumeration value="RTEC"/>
-      <xsd:enumeration value="NOTIFY"/>
-      <xsd:enumeration value="RTNOTIFY"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="CIAOEventsDef">
-    <xsd:sequence>
-      <xsd:element name="eventServiceConfiguration" type="CIAO:EventServiceDescription" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-  
-  <xsd:complexType name="EventServiceDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="type" type="CIAO:EventServiceType"/>
-      <xsd:element name="svc_cfg_file" type="xsd:string"/>
-      <xsd:element name="filter" type="CIAO:Filter" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="addr_serv" type="CIAO:AddressServerDescription" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="udp_sender" type="CIAO:UDPSenderDescription" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="udp_receiver" type="CIAO:UDPReceiverDescription" minOccurs="0" maxOccurs="unbounded"/> 
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-  
-<!-- =============================================================== -->
-<!--                  CIAO Event Filter Description                  -->
-<!-- =============================================================== -->  
-  
-  <xsd:simpleType name="FilterType">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="CONJUNCTION"/>
-      <xsd:enumeration value="DISJUNCTION"/>
-      <xsd:enumeration value="LOGICAL_AND"/>
-      <xsd:enumeration value="NEGATE"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="Filter">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="CIAO:FilterType"/>     
-      <xsd:element name="source" type="xsd:string" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>  
-  
-<!-- =============================================================== -->
-<!--            CIAO Event Service Federation Description            -->
-<!-- =============================================================== -->  
-
-  <xsd:complexType name="AddressServerDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="port" type="xsd:unsignedShort"/>
-      <xsd:element name="address" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="UDPSenderDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="addr_serv_id" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  
-  <xsd:complexType name="UDPReceiverDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="addr_serv_id" type="xsd:string" minOccurs="0" />
-      <xsd:element name="is_multicast" type="xsd:boolean"/>
-      <xsd:element name="listen_port" type="xsd:unsignedShort"/>
-    </xsd:sequence>
-  </xsd:complexType> 
-
-</xsd:schema>
diff --git a/CIAO/docs/schema/CIAOServerResources.xsd b/CIAO/docs/schema/CIAOServerResources.xsd
deleted file mode 100644
index 7a62a0e6eab..00000000000
--- a/CIAO/docs/schema/CIAOServerResources.xsd
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema targetNamespace="http://www.dre.vanderbilt.edu/ServerResources"
-            xmlns:CIAO="http://www.dre.vanderbilt.edu/ServerResources"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            attributeFormDefault="unqualified">
-
-  <xsd:element name="ServerResources" type="CIAO:ServerResourcesDef">
-    <xsd:annotation>
-      <xsd:documentation>
-        Root element for defining all the resources used by a DeploymentPlan.  
-        A CIAO:ServerResources document should reside in a separate file.  
-        A DeploymentPlan can refer to one or more CIAO:ServerResources file names
-        using the "infoProperty" tag.  
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
-
-  <xsd:complexType name="ServerResourcesDef">
-    <xsd:sequence>
-      <xsd:element name="cmdline" type="CIAO:ServerCmdlineOptions" minOccurs="0"/>
-      <xsd:element name="svcconf" type="CIAO:ACESvcConf" minOccurs="0"/>
-      <xsd:element name="orbConfigs" type="CIAO:ORBConfigs" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- =============================================================== -->
-
-  <xsd:complexType name="ServerCmdlineOptions">
-    <xsd:annotation>
-      <xsd:documentation>
-        Just a list of argv's that should be appended to the command
-        line used to start up the NodeApplication.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="arg" type="xsd:string" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- ================================================================ -->
-
-  <xsd:complexType name="ACESvcConf">
-    <xsd:annotation>
-      <xsd:documentation>
-        Contains either a pointer to a svc.conf file, or the actual
-        content of the svc.conf file required to configure the
-        NodeApplication.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <!-- Specify the URI of a svc.conf file. -->
-      <xsd:element name="uri" type="xsd:string"/>
-
-      <!-- If we agree to use only XML based svc.conf "file", we will
-           support inlined svcconf entries here.  If that will be the
-           case, we still need to convert ACE_Svc_Conf DTD to schema. -->
-      <!--
-        <xsd:element name="inline" type="ACE_Svc_Conf"/>
-        -->
-    </xsd:choice>
-  </xsd:complexType>
-
-<!-- ========================================================================= -->
-
-  <xsd:complexType name="ORBConfigs">
-    <xsd:annotation>
-      <xsd:documentation>
-        Contains the shared resources the component ORB must support
-        and all available policySets that components installed under
-        the ORB can request.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="resources" type="CIAO:ORBResources" 
-                                    minOccurs="0"/>
-      <xsd:element name="policySet" type="CIAO:PolicySet"
-                                    maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- ========================================================================= -->
-
-  <xsd:complexType name="ORBResources">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="threadpool" type="CIAO:ThreadpoolDef"/>
-      <xsd:element name="threadpoolWithLanes" type="CIAO:ThreadpoolWithLanesDef"/>
-      <xsd:element name="connectionBands" type="CIAO:ConnectionBandsDef"/>
-      <!-- Other ORB-wide resources that must be allocated by the ORB -->
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:simpleType name="Priority">
-    <xsd:restriction base="xsd:int">
-      <xsd:minInclusive value="0"/>
-      <xsd:maxInclusive value="32767"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="ThreadpoolDef">
-    <xsd:sequence>
-      <xsd:element name="stacksize" type="xsd:unsignedLong"/>
-      <xsd:element name="static_threads" type="xsd:unsignedLong"/>
-      <xsd:element name="dynamic_threads" type="xsd:unsignedLong"/>
-      <xsd:element name="default_priority" type="CIAO:Priority"/>
-      <xsd:element name="allow_request_buffering" type="xsd:boolean"/>
-      <xsd:element name="max_buffered_requests" type="xsd:unsignedLong"/>
-      <xsd:element name="max_request_buffered_size" type="xsd:unsignedLong"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="ThreadpoolWithLanesDef">
-    <xsd:sequence>
-      <xsd:element name="threadpoolLane" type="CIAO:ThreadpoolLaneDef" 
-                   maxOccurs="unbounded"/>
-      <xsd:element name="stacksize" type="xsd:unsignedLong" />
-      <xsd:element name="allow_borrowing" type="xsd:boolean"/>
-      <xsd:element name="allow_request_buffering" type="xsd:boolean"/>
-      <xsd:element name="max_buffered_requests" type="xsd:unsignedLong"/>
-      <xsd:element name="max_request_buffered_size" type="xsd:unsignedLong"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>  <!-- Threadpool ID should be 
-                                                   referenced by individual policies
-                                                   in the policysets below -->
-  </xsd:complexType>
-
-  <xsd:complexType name="ThreadpoolLaneDef">
-    <xsd:sequence>
-      <xsd:element name="static_threads" type="xsd:unsignedLong"/>
-      <xsd:element name="dynamic_threads" type="xsd:unsignedLong"/>
-      <xsd:element name="priority" type="CIAO:Priority"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ConnectionBandsDef">
-    <xsd:annotation>
-    <xsd:documentation>
-      This is only used to provide a ORB-wide view of all connection bands.
-      The ORB doesn't really need to "create" this resource.
-    </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="band" type="CIAO:PriorityBandDef" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="PriorityBandDef">
-    <xsd:sequence>
-      <xsd:element name="low" type="xsd:int"/>
-      <xsd:element name="high" type="xsd:int"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- ========================================================================= -->
-
-  <xsd:complexType name="PolicySet">
-    <xsd:annotation>
-      <xsd:documentation>
-        Contains a set of CORBA Policies that can be applied to a
-        component instance at once.  We should eventually expand this
-        list to incorporate all the policies defined in
-        ciaopolicy.xs.  I'm focusing on the RT aspects for now.
-
-        The ID of a policy set should be referenced by the component
-        instances in a DeploymentPlan document under the
-        "deployedResource" tag.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="priorityModel" type="CIAO:PriorityModelPolicyDef"/>
-      <xsd:element name="nwpriorityModel" type="CIAO:NWPriorityModelPolicyDef"/>
-      <xsd:element name="cnwpriorityModel" type="CIAO:CNWPriorityModelPolicyDef"/>
-      <xsd:element name="threadpool" type="xsd:IDREF"/>
-      <xsd:element name="priorityBandedConnection" type="xsd:IDREF"/>
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-  <xsd:simpleType name="PriorityModel">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="SERVER_DECLARED"/>
-      <xsd:enumeration value="CLIENT_PROPAGATED"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="NWPriorityModel">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="SERVER_DECLARED_NWPRIORITY"/>
-      <xsd:enumeration value="CLIENT_PROPAGATED_NWPRIORITY"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="PriorityModelPolicyDef">
-    <xsd:sequence>
-      <xsd:element name="priority_model" type="CIAO:PriorityModel"/>
-    </xsd:sequence>
-    <xsd:attribute name="server_priority" type="CIAO:Priority"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="NWPriorityModelPolicyDef">
-    <xsd:sequence>
-      <xsd:element name="nw_priority_model" type="CIAO:NWPriorityModel"/>
-      <xsd:element name="request_dscp" type="xsd:long"/>
-      <xsd:element name="reply_dscp" type="xsd:long"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="CNWPriorityModelPolicyDef">
-    <xsd:sequence>
-      <xsd:element name="request_dscp" type="xsd:long"/>
-      <xsd:element name="reply_dscp" type="xsd:long"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/CIAO/docs/schema/Deployment.xsd b/CIAO/docs/schema/Deployment.xsd
deleted file mode 100644
index 591aa588d74..00000000000
--- a/CIAO/docs/schema/Deployment.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-            <xsd:include schemaLocation="Basic_Deployment_Data.xsd"/>
-            <xsd:include schemaLocation="cpd.xsd"/>
-            <xsd:include schemaLocation="ccd.xsd"/>
-            <xsd:include schemaLocation="cdd.xsd"/>
-            <xsd:include schemaLocation="cdp.xsd"/>
-            <xsd:include schemaLocation="cid.xsd"/>
-            <xsd:include schemaLocation="iad.xsd"/>
-            <xsd:include schemaLocation="pcd.xsd"/>
-            <xsd:include schemaLocation="toplevel.xsd"/>
-
-
-<!-- Top-level elements. -->
-
-  <xsd:element name="domain" type="Deployment:Domain"/>
-  <xsd:element name="DeploymentPlan" type="Deployment:deploymentPlan"/>
-  <xsd:element name="implementationArtifactDescription" type="Deployment:ImplementationArtifactDescription" />
-  <xsd:element name="componentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/>
-  <xsd:element name="componentImplementationDescription" type="Deployment:ComponentImplementationDescription"/>
-  <xsd:element name="componentPackageDescription" type="Deployment:ComponentPackageDescription"/>
-  <xsd:element name="packageConfiguration" type="Deployment:PackageConfiguration"/>
-  <xsd:element name="topLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/>
-
-</xsd:schema>
diff --git a/CIAO/docs/schema/Modified_Deployment.xsd b/CIAO/docs/schema/Modified_Deployment.xsd
deleted file mode 100644
index 65f5eb81d1e..00000000000
--- a/CIAO/docs/schema/Modified_Deployment.xsd
+++ /dev/null
@@ -1,826 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-
-  <xsd:simpleType name="TCKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="tk_null"/>
-      <xsd:enumeration value="tk_void"/>
-      <xsd:enumeration value="tk_short"/>
-      <xsd:enumeration value="tk_long"/>
-      <xsd:enumeration value="tk_ushort"/>
-      <xsd:enumeration value="tk_ulong"/>
-      <xsd:enumeration value="tk_float"/>
-      <xsd:enumeration value="tk_double"/>
-      <xsd:enumeration value="tk_boolean"/>
-      <xsd:enumeration value="tk_char"/>
-      <xsd:enumeration value="tk_octet"/>
-      <xsd:enumeration value="tk_any"/>
-      <xsd:enumeration value="tk_TypeCode"/>
-      <xsd:enumeration value="tk_Principal"/>
-      <xsd:enumeration value="tk_objref"/>
-      <xsd:enumeration value="tk_struct"/>
-      <xsd:enumeration value="tk_union"/>
-      <xsd:enumeration value="tk_enum"/>
-      <xsd:enumeration value="tk_string"/>
-      <xsd:enumeration value="tk_sequence"/>
-      <xsd:enumeration value="tk_array"/>
-      <xsd:enumeration value="tk_alias"/>
-      <xsd:enumeration value="tk_except"/>
-      <xsd:enumeration value="tk_longlong"/>
-      <xsd:enumeration value="tk_ulonglong"/>
-      <xsd:enumeration value="tk_longdouble"/>
-      <xsd:enumeration value="tk_wchar"/>
-      <xsd:enumeration value="tk_wstring"/>
-      <xsd:enumeration value="tk_wfixed"/>
-      <xsd:enumeration value="tk_value"/>
-      <xsd:enumeration value="tk_value_box"/>
-      <xsd:enumeration value="tk_native"/>
-      <xsd:enumeration value="tk_abstract_interface"/>
-      <xsd:enumeration value="tk_local_interface"/>
-      <xsd:enumeration value="tk_component"/>
-      <xsd:enumeration value="tk_home"/>
-      <xsd:enumeration value="tk_event"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="DataType">
-    <xsd:choice>
-      <xsd:element name="kind" type="Deployment:TCKind"/>
-<!--
-@@ not used, what for?
-
-      <xsd:element name="enum" type="Deployment:EnumType"/>
-      <xsd:element name="objref" type="Deployment:ObjrefType"/>
-      <xsd:element name="boundedString" type="Deployment:BoundedStringType"/>
-      <xsd:element name="fixed" type="Deployment:FixedType"/>
-      <xsd:element name="array" type="Deployment:ArrayType"/>
-      <xsd:element name="sequence" type="Deployment:SequenceType"/>
-      <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:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="DataValue">
-    <xsd:choice>
-      <xsd:element name="short" type="xsd:short"/>
-      <xsd:element name="long" type="xsd:int"/>
-      <xsd:element name="ushort" type="xsd:unsignedShort"/>
-      <xsd:element name="ulong" type="xsd:unsignedInt"/>
-      <xsd:element name="float" type="xsd:float"/>
-      <xsd:element name="double" type="xsd:double"/>
-      <xsd:element name="boolean" type="xsd:boolean"/>
-      <xsd:element name="octet" type="xsd:unsignedByte"/>
-      <!-- xsd:element name="opaque" type="xsd:base64Binary"/ -->
-      <xsd:element name="objref" type="xsd:string"/>
-      <xsd:element name="enum" type="xsd:string"/>
-      <xsd:element name="string" type="xsd:string"/>
-      <xsd:element name="longlong" type="xsd:long"/>
-      <xsd:element name="ulonglong" type="xsd:unsignedLong"/>
-      <xsd:element name="longdouble" type="xsd:double"/>
-      <xsd:element name="fixed" type="xsd:string"/>
-
-<!--
-@@ recursive
-      <xsd:element name="any" type="Deployment:Any"/>
--->
-
-      <xsd:element name="typecode" type="Deployment:DataType"/>
-
-<!--
-@@ recursive
-      <xsd:element name="element" type="Deployment:DataValue"/>
-      <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:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Any">
-    <xsd:sequence>
-      <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Property">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <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"/>
-      <xsd:element name="label" type="xsd:string"/>
-<!--
-@@ 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:sequence>
-  </xsd:complexType>
-
-
-  <xsd:simpleType name="SatisfierPropertyKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="Quantity"/>
-      <xsd:enumeration value="Capacity"/>
-      <xsd:enumeration value="Minimum"/>
-      <xsd:enumeration value="Maximum"/>
-      <xsd:enumeration value="Attribute"/>
-      <xsd:enumeration value="Selection"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-  <xsd:complexType name="SatisfierProperty">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/>
-      <xsd:element name="value" type="Deployment:Any"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Resource">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="SharedResource">
-    <xsd:sequence>
-      <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:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Domain">
-    <xsd:sequence>
-      <xsd:element name="label" 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"/>
-<!--
-@@ recursive, not used
-      <xsd:element name="interconnect" type="Deployment:Interconnect"/>
-      <xsd:element name="bridge" type="Deployment:Bridge"/>
--->
-      <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Requirement">
-    <xsd:sequence>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- Deployment -->
-
-  <xsd:complexType name="ResourceDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="requirementName" type="xsd:string"/>
-      <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ArtifactDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="location" type="xsd:string" maxOccurs="unbounded"/>
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="MonolithicDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="artifact" type="xsd:IDREF" maxOccurs="unbounded"/> <!-- ArtifactDeploymentDescription -->
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-  <xsd:simpleType name="ResourceUsageKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="None"/>
-      <xsd:enumeration value="InstanceUsesResource"/>
-      <xsd:enumeration value="ResourceUsesInstance"/>
-      <xsd:enumeration value="PortUsesResource"/>
-      <xsd:enumeration value="ResourceUsesPort"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-  <xsd:complexType name="InstanceResourceDeploymentDescription">
-    <xsd:sequence>
-      <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:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="InstanceDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="implementation" type="xsd:IDREF"/> <!-- MonolithicDeploymentDescription -->
-      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
-      <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-
-  <xsd:simpleType name="CCMComponentPortKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="Facet"/>
-      <xsd:enumeration value="SimplexReceptacle"/>
-      <xsd:enumeration value="MultiplexReceptacle"/>
-      <xsd:enumeration value="EventEmitter"/>
-      <xsd:enumeration value="EventPublisher"/>
-      <xsd:enumeration value="EventConsumer"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-  <xsd:complexType name="ComponentPortDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="specificType" type="xsd:string"/>
-      <xsd:element name="supportedType" type="xsd:string"/>
-      <xsd:element name="provider" type="xsd:string"/>
-      <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:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentPropertyDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentInterfaceDescription">
-    <!-- @@mxiong: added minOccurs="0" maxOccurs="unbounded"
-                   when adding config_handler support
-                   for repoMan
-    -->
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-        <xsd:element name="specificType" type="xsd:string"/>
-        <xsd:element name="supportedType" type="xsd:string" maxOccurs="unbounded" />
-        <xsd:element name="idlFile" type="xsd:string" minOccurs="0"/>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-        <xsd:element name="port" type="Deployment:ComponentPortDescription" maxOccurs="unbounded"/>
-        <xsd:element name="property" type="Deployment:ComponentPropertyDescription" minOccurs="0"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-    <!-- @@mxiong: added a href attribute
-                   when adding config_handler support
-                   for repoMan
-    -->
-    <xsd:attribute name="href" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentExternalPortEndpoint">
-    <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="PlanSubcomponentPortEndpoint">
-    <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>
-      <xsd:element name="provider" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
-      <xsd:element name="instance" type="xsd:IDREF"/> <!-- InstanceDeploymentDescription -->
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ExternalReferenceEndpoint">
-    <xsd:sequence>
-      <xsd:element name="location" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ConnectionResourceDeploymentDescription">
-    <xsd:sequence>
-      <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:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="PlanConnectionDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ImplementationDependency">
-    <xsd:sequence>
-      <xsd:element name="requiredType" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <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="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"/>
-     <!-- potentially recursive, not used
-          <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
-     -->
-     <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/>
-     <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-     <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-
-
-<!-- Implementation -->
-
-
-  <xsd:complexType name="Capability">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="NamedImplementationArtifact">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <!-- @@ recursive NIA->IAD->NIA -->
-      <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ImplementationArtifactDescription">
-    <!-- @@mxiong: added minOccurs="0" maxOccurs="1"
-                   when adding config_handler support
-                   for repoMan
-    -->
-    <xsd:choice minOccurs="0" maxOccurs="1">
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-
-        <!-- @@ There probably should be only one location? -->
-        <xsd:element name="location" type="xsd:string" maxOccurs="unbounded"/>
-        <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:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-    <!-- @@mxiong: added a href attribute
-                   when adding config_handler support
-                   for repoMan
-    -->
-    <xsd:attribute name="href" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ImplementationRequirement">
-    <xsd:sequence>
-      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
-      <xsd:element name="resourcePort" type="xsd:string"/>
-      <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:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="MonolithicImplementationDescription">
-    <xsd:sequence>
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact" maxOccurs="unbounded"/>
-      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="PackagedComponentImplementation">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <!-- @@ recursive CPD->PCI->CID->CAD->SID->CPD -->
-      <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentPackageDescription">
-    <!-- @@mxiong: added minOccurs="0" maxOccurs="1"
-                   when adding config_handler support
-                   for repoMan
-    -->
-    <xsd:choice minOccurs="0" maxOccurs="1">
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-        <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:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-    <!-- @@mxiong: added href
-                   when adding config_handler support
-                   for repoMan
-    -->
-    <xsd:attribute name="href" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentPackageReference">
-    <xsd:sequence>
-      <xsd:element name="requiredUUID" type="xsd:string"/>
-      <xsd:element name="requiredName" type="xsd:string"/>
-      <xsd:element name="requiredType" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="SubcomponentInstantiationDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="package" type="Deployment:ComponentPackageDescription"/>
-      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="SubcomponentPortEndpoint">
-    <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>
-      <xsd:element name="instance" type="xsd:IDREF"/> <!-- SubcomponentInstantiationDescription -->
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="AssemblyConnectionDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="SubcomponentPropertyReference">
-    <xsd:sequence>
-      <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="AssemblyPropertyMapping">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentAssemblyDescription">
-    <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:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentImplementationDescription">
-    <!-- @@mxiong: added minOccurs="0" maxOccurs="unbounded"
-                   when adding config_handler support
-                   for repoMan
-    -->
-    <xsd:choice minOccurs="0" maxOccurs="1">
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-        <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/>
-        <xsd:choice>
-          <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/>
-          <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/>
-        </xsd:choice>
-        <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:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-    <!-- @@mxiong: added href
-                   when adding config_handler support
-                   for repoMan
-    -->
-    <xsd:attribute name="href" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-
-
-<!-- Package -->
-
-
-  <xsd:complexType name="PackageConfiguration">
-    <xsd:choice>
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-<!--
-@@ recursive, not used
-        <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/>
--->
-
-        <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/>
-        <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/>
-        <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="TopLevelPackageDescription">
-    <xsd:sequence>
-      <xsd:element name="package" type="Deployment:PackageConfiguration" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- Top-level elements. -->
-
-
-  <xsd:element name="domain" type="Deployment:Domain"/>
-  <xsd:element name="deploymentPlan" type="Deployment:DeploymentPlan"/>
-  <xsd:element name="implementationArtifactDescription" type="Deployment:ImplementationArtifactDescription" />
-  <xsd:element name="componentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/>
-  <xsd:element name="componentImplementationDescription" type="Deployment:ComponentImplementationDescription"/>
-  <xsd:element name="componentPackageDescription" type="Deployment:ComponentPackageDescription"/>
-  <xsd:element name="packageConfiguration" type="Deployment:PackageConfiguration"/>
-  <xsd:element name="topLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/>
-
-
-
-<!-- VAULT
-
-Place for strange things. Nobody knows what they are for...
-
--->
-
-<!--
-
-  <xsd:complexType name="EnumType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="xsd:string" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ObjrefType">
-    <xsd:sequence>
-      <xsd:element name="name" 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:choice>
-  </xsd:complexType>
-
-
-  <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:choice>
-  </xsd:complexType>
-
-
-  <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: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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="AliasType">
-    <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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="StructType">
-    <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: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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="ValueType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="ValueMemberType">
-    <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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="UnionType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="UnionMemberType">
-    <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:choice>
-  </xsd:complexType>
-
-
-  <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:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Bridge">
-    <xsd:sequence>
-      <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:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="Interconnect">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="PlanPropertyMapping">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <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:choice>
-  </xsd:complexType>
-
-
-  <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:choice>
-  </xsd:complexType>
-
--->
-
-<!--
-
-  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:choice>
-  </xsd:complexType>
-
--->
-
-</xsd:schema>
diff --git a/CIAO/docs/schema/README.html b/CIAO/docs/schema/README.html
deleted file mode 100644
index d810c8a6065..00000000000
--- a/CIAO/docs/schema/README.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<!-- $Id$ -->
-<html> <head>
-<title>Contents of $CIAO_ROOT/docs/schema</title>
-</head>
-
-<body>
-<h1>Contents of $CIAO_ROOT/docs/schema</h1>
-The schema in this directory are all based on the new Deployment and
-Configuration spec. As part of our work on DAnCE we have tried to
-subset and normalize the schema so that our developers, and tools
-would be able to parse and use the information effectively. 
-
-The following table illustrates the meaning and use of the various
-schemata in this directory:
-<table width="100%" border=1>
-  <tr valign=top>
-    <td><b>Spec_Defined_Deployment.xsd</b></td>
-    <td>This is the schema file from the spec which is unaltered. This
-    is just for reference. CIAO and DAnCE will not be using this file
-    directly. 
-    </td>
-  </tr>
-  <tr valign=top>
-   <td><b>Spec_Defined_XMI.xsd</b></td>
-   <td>The OMG spec defined schema file uses definitions from another
-   specification called the XMI spec which is part of the OMG
-   specification suite.  This schema file is again for reference
-   without any edits.
-   </td>
-  </tr>
-  <tr valign=top>
-    <td><b>ccd.xsd, cdd.xsd, cdp.xsd, cid.xsd, cpd.xsd, iad.xsd,
-    pcd.xsd and toplevel.xcd</b></td>
-    <td> Descriptors that will be used by DAnCE. Section 5.5.3 of the
-    Deployment and Configuration spec talks about the various
-    descriptors that are part of the package. The schema files are
-    broken down in accordance with the suggested descriptor format in
-    the  section mentioned above. 
-    </td>
-  </tr>
-  <tr valign=top">
-    <td><b>Deployment.xsd</b></td>
-    <td> The schema file that will be used by the applications in
-    their descriptors. Applications need not use Deployment.xsd, but
-    using this is encouraged for portability of their intance
-    documents.</td>
-  </tr>
-  <tr valign=top">
-    <td><b>Modified_Deployment.xsd</b></td>
-    <td> This schema is modified from the original spec defined
-    schema. It is a bit simplified with different sections that makes
-    things easier for the developer to read and digest the
-    information. Not used within DAnCE.</td>
-  </tr>
-  <tr valign=top">
-    <td><b>unused_elements.xsd</b></td>
-    <td> Schema elements that are not used within the OMG's schema and
-    the ones that CIAo and DAnCedoesn't support.</td>
-  </tr>
-</table>
-</body> 
-</html>
-
diff --git a/CIAO/docs/schema/SANet_Network.xsd b/CIAO/docs/schema/SANet_Network.xsd
deleted file mode 100644
index d614528b481..00000000000
--- a/CIAO/docs/schema/SANet_Network.xsd
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.vanderbilt.edu/SANet SANet_Network.xsd" xmlns:SANet="http://www.vanderbilt.edu/SANet"
-  targetNamespace="http://www.vanderbilt.edu/SANet" elementFormDefault="qualified">
-  <!-- Simple types. -->
-  <xs:simpleType name="NodeID">
-    <xs:restriction base="xs:int">
-      <xs:minInclusive value="1" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="PortID">
-    <xs:restriction base="xs:string" />
-  </xs:simpleType>
-  <xs:simpleType name="TaskCost">
-    <xs:restriction base="xs:double" />
-  </xs:simpleType>
-  <xs:simpleType name="CondUtil">
-    <xs:restriction base="xs:double" />
-  </xs:simpleType>
-  <xs:simpleType name="CondKind">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="ENVIRON" />
-      <xs:enumeration value="SYSTEM" />
-      <xs:enumeration value="DATA" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="Probability">
-    <xs:restriction base="xs:double">
-      <xs:minInclusive value="0" />
-      <xs:maxInclusive value="1" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="LinkWeight">
-    <xs:restriction base="xs:double">
-      <xs:minInclusive value="-1" />
-      <xs:maxInclusive value="1" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="MultFactor">
-    <xs:restriction base="xs:double">
-      <xs:minInclusive value="0" />
-      <xs:maxInclusive value="1" />
-    </xs:restriction>
-  </xs:simpleType>
-  <!-- Complex types corresponding to IDL structures.
-       (nodes, links, and network). -->
-  <xs:complexType name="TaskNode">
-    <xs:sequence>
-      <xs:element name="nodeID" type="SANet:NodeID" />
-      <xs:element name="name" type="xs:string" default="" />
-      <xs:element name="priorProb" type="SANet:Probability" />
-      <xs:element name="attenFactor" type="SANet:MultFactor" default="1" />
-      <xs:element name="cost" type="SANet:TaskCost" default="0" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="CondNode">
-    <xs:sequence>
-      <xs:element name="nodeID" type="SANet:NodeID" />
-      <xs:element name="name" type="xs:string" default="" />
-      <xs:element name="probTrue" type="SANet:Probability" default="0" />
-      <xs:element name="utility" type="SANet:CondUtil" default="0" />
-      <xs:element name="kind" type="SANet:CondKind" default="ENVIRON" />
-      <xs:element name="attenFactor" type="SANet:MultFactor" default="1" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="PrecondLink">
-    <xs:sequence>
-      <xs:element name="condID" type="SANet:NodeID" />
-      <xs:element name="taskID" type="SANet:NodeID" />
-      <xs:element name="portID" type="SANet:PortID" />
-      <xs:element name="trueProb" type="SANet:Probability" />
-      <xs:element name="falseProb" type="SANet:Probability" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="EffectLink">
-    <xs:sequence>
-      <xs:element name="taskID" type="SANet:NodeID" />
-      <xs:element name="condID" type="SANet:NodeID" />
-      <xs:element name="portID" type="SANet:PortID" />
-      <xs:element name="weight" type="SANet:LinkWeight" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="Network">
-    <xs:sequence>
-      <xs:element name="defaultAttenFactor" type="SANet:MultFactor" default="1" />
-      <xs:element name="defaultTaskCost" type="SANet:TaskCost" default="0" />
-      <xs:element name="defaultCondUtil" type="SANet:CondUtil" default="0" />
-      <xs:element name="defaultCondProbTrue" type="SANet:Probability" default="0" />
-      <xs:element name="linkThresh" type="SANet:LinkWeight" default="0" />
-      <xs:element name="taskNode" type="SANet:TaskNode" maxOccurs="unbounded" />
-      <xs:element name="condNode" type="SANet:CondNode" maxOccurs="unbounded" />
-      <xs:element name="precondLink" type="SANet:PrecondLink" maxOccurs="unbounded" />
-      <xs:element name="effectLink" type="SANet:EffectLink" maxOccurs="unbounded" />
-    </xs:sequence>
-  </xs:complexType>
-  <!-- Top-level network element. -->
-  <xs:element name="network" type="SANet:Network" />
-</xs:schema>
\ No newline at end of file
diff --git a/CIAO/docs/schema/ServerResourceUsage.txt b/CIAO/docs/schema/ServerResourceUsage.txt
deleted file mode 100644
index d8fc47ca7b3..00000000000
--- a/CIAO/docs/schema/ServerResourceUsage.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-                  How to use CIAOServerResources.xsd
-
-Assuming we store two CIAO:ServerResources documents in two XML files
-called "RTLinuxServerConfig.csr" and "RTwIN32ServerConfig.csr"
-respectively.  Two things need to happen in order to use the
-PolicySet's defined in these files.  First, we need to tell the DnC
-tools what are all the CIAOServerResources files a DeploymentPlan
-needs.  This can easily be done by enumerating all these file in the
-<infoProperty> element under the <DeploymentPlan>. For example, the
-following XML document snippet shows a DeploymentPlan will reference
-to two aforementioned CIAO:ServerResources files.  The property name
-"CIAOServerResourceRef" is a CIAO-specific extension that signifies
-this need.  The values of these properties simply specify the
-filenames.
-
-
-   <infoProperty>
-     <name>CIAOServerResourceRef</name>
-     <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-         <string>RTLinuxServerConfig.csr</string>
-        </value>
-     </value>
-
-     <name>CIAOServerResourceRef</name>
-     <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RTWin32ServerConfig.csr</string>
-        </value>
-     </value>
-   </infoProperty>
-
-Second, we can now use the policy sets defined in these files by
-associating a policy set with the entity the policy set will be
-applied on.  Currently, only associations with component instances are
-supported.  A component instance in deployment plan can specify the
-policy set it wishes to be instantiated with.  A PolicySet is
-referenced by its name and the CIAO:ServerResources name.
-
-   <deploymentplan>
-     ....
-     <instance ...>
-
-       <deployedResource>
-         <resourceUsage>InstanceUsesResource</resourceUsage>
-         <requirementName>CIAO:PolicySet</requirementName>
-         <resourceName>here_we_insert_the_name_defined_in_CIAO:ServerResources</resourcename>
-         <property>
-// 
-// name could be CIAO:InstancePolicy or CIAO:ReceptaclePolicy.
-// Here we show an example of an CIAO::InstancePolicy.
-//
-           <name>CIAO:InstancePolicy</name>
-           <value>
-             <type>tk_string</type>
-             <value>
-               <string>here_we_insert_the_PolicySet_name_defined_in_the_ServerResources</string>
-             </value>
-           </value>
-         </property>
-       </deployedResource>
-
-// Now we show an example of a CIAO:ReceptaclePolicy.
-//
-       <deployedResource>
-         <resourceUsage>InstanceUsesResource</resourceUsage>
-         <requirementName>CIAO:PolicySet</requirementName>
-         <resourceName>here_we_insert_the_name_defined_in_CIAO:ServerResources</resourcename>
-//
-// First we specify that we are going to define a receptacle policy.
-//
-         <property>
-//
-// Note the name of the policy.
-//
-           <name>CIAO:ReceptaclePolicy</name>
-           <value>
-             <type>tk_string</type>
-             <value>
-               <string>here_we_insert_the_PolicySet_name_defined_in_the_ServerResources</string>
-             </value>
-           </value>
-         </property>
-//
-// Now we specify the receptacle (using the receptacle name) that is going to
-// be associated with this policy.
-//
-         <property>
-           <name>receptacle name from the .ccd file</name>
-           <value>
-             <type>tk_string</type>
-             <value>
-               <string>here_we_insert_the_PolicySet_name_defined_in_the_ServerResources</string>
-             </value>
-           </value>
-         </property>
-       </deployedResource>
-
-     </instance>
-     </instance>
-   </deploymentplan>
-  
-If only the name of the CIAO:ServerResources is specified, we are
-using it as a collocation constraint.  In this case, the
-<deployedResource> will contain no <property> sub-element.  Component
-instances with different <resourceName> values will be deployed to the
-same target node with different ServerResources names.  DAnCE should
-create two differnet NodeApplication on the same node.
-
-Likewise, specifying different CIAO:PolicySet IDs will force component
-instances to be deployed into different containers (if they have the
-same target node and ServerResource ID.)
-
diff --git a/CIAO/docs/schema/Spec_Defined_Deployment.xsd b/CIAO/docs/schema/Spec_Defined_Deployment.xsd
deleted file mode 100644
index a59a47f1360..00000000000
--- a/CIAO/docs/schema/Spec_Defined_Deployment.xsd
+++ /dev/null
@@ -1,897 +0,0 @@
-<xsd:schema
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:Deployment="http://www.omg.org/Deployment"
-    targetNamespace="http://www.omg.org/Deployment"
-    >
-  <xsd:import namespace="http://www.omg.org/XMI"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Any" type="Deployment:Any"/>
-  <xsd:complexType name="DataType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="kind" type="Deployment:TCKind"/>
-      <xsd:element name="enum" type="Deployment:EnumType"/>
-      <xsd:element name="objref" type="Deployment:ObjrefType"/>
-      <xsd:element name="boundedString" type="Deployment:BoundedStringType"/>
-      <xsd:element name="fixed" type="Deployment:FixedType"/>
-      <xsd:element name="array" type="Deployment:ArrayType"/>
-      <xsd:element name="sequence" type="Deployment:SequenceType"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="DataType" type="Deployment:DataType"/>
-  <xsd:complexType name="DataValue">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="short" type="xsd:short"/>
-      <xsd:element name="long" type="xsd:int"/>
-      <xsd:element name="ushort" type="xsd:unsignedShort"/>
-      <xsd:element name="ulong" type="xsd:unsignedInt"/>
-      <xsd:element name="float" type="xsd:float"/>
-      <xsd:element name="double" type="xsd:double"/>
-      <xsd:element name="boolean" type="xsd:boolean"/>
-      <xsd:element name="octet" type="xsd:unsignedByte"/>
-      <xsd:element name="opaque" type="xsd:base64Binary"/>
-      <xsd:element name="objref" type="xsd:string"/>
-      <xsd:element name="enum" type="xsd:string"/>
-      <xsd:element name="string" type="xsd:string"/>
-      <xsd:element name="longlong" type="xsd:long"/>
-      <xsd:element name="ulonglong" type="xsd:unsignedLong"/>
-      <xsd:element name="longdouble" type="xsd:double"/>
-      <xsd:element name="fixed" type="xsd:string"/>
-      <xsd:element name="any" type="Deployment:Any"/>
-      <xsd:element name="typecode" type="Deployment:DataType"/>
-      <xsd:element name="element" type="Deployment:DataValue"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="DataValue" type="Deployment:DataValue"/>
-  <xsd:complexType name="EnumType">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="EnumType" type="Deployment:EnumType"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="BoundedStringType" type="Deployment:BoundedStringType"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="FixedType" type="Deployment:FixedType"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ArrayType" type="Deployment:ArrayType"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SequenceType" type="Deployment:SequenceType"/>
-  <xsd:complexType name="AliasType">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="AliasType" type="Deployment:AliasType"/>
-  <xsd:complexType name="StructType">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="StructType" type="Deployment:StructType"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="StructMemberType" type="Deployment:StructMemberType"/>
-  <xsd:complexType name="ValueType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ValueType" type="Deployment:ValueType"/>
-  <xsd:complexType name="ValueMemberType">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ValueMemberType" type="Deployment:ValueMemberType"/>
-  <xsd:complexType name="UnionType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="UnionType" type="Deployment:UnionType"/>
-  <xsd:complexType name="UnionMemberType">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="UnionMemberType" type="Deployment:UnionMemberType"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="NamedValue" type="Deployment:NamedValue"/>
-  <xsd:complexType name="Bridge">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Bridge" type="Deployment:Bridge"/>
-  <xsd:complexType name="Interconnect">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Interconnect" type="Deployment:Interconnect"/>
-  <xsd:complexType name="Node">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Node" type="Deployment:Node"/>
-  <xsd:complexType name="Resource">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Resource" type="Deployment:Resource"/>
-  <xsd:complexType name="SharedResource">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <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="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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Domain" type="Deployment:Domain"/>
-  <xsd:complexType name="PlanPropertyMapping">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PlanPropertyMapping" type="Deployment:PlanPropertyMapping"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PlanSubcomponentPropertyReference" type="Deployment:PlanSubcomponentPropertyReference"/>
-  <xsd:complexType name="PlanSubcomponentPortEndpoint">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PlanSubcomponentPortEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/>
-  <xsd:complexType name="PlanConnectionDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PlanConnectionDescription" type="Deployment:PlanConnectionDescription"/>
-  <xsd:complexType name="InstanceDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="InstanceDeploymentDescription" type="Deployment:InstanceDeploymentDescription"/>
-  <xsd:complexType name="MonolithicDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="MonolithicDeploymentDescription" type="Deployment:MonolithicDeploymentDescription"/>
-  <xsd:complexType name="ArtifactDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="location" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ArtifactDeploymentDescription" type="Deployment:ArtifactDeploymentDescription"/>
-  <xsd:complexType name="DeploymentPlan">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/>
-      <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/>
-      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>
-      <xsd:element name="connection" type="Deployment:PlanConnectionDescription"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="DeploymentPlan" type="Deployment:DeploymentPlan"/>
-  <xsd:complexType name="ResourceDeploymentDescription">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ResourceDeploymentDescription" type="Deployment:ResourceDeploymentDescription"/>
-  <xsd:complexType name="InstanceResourceDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="InstanceResourceDeploymentDescription" type="Deployment:InstanceResourceDeploymentDescription"/>
-  <xsd:complexType name="ConnectionResourceDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ConnectionResourceDeploymentDescription" type="Deployment:ConnectionResourceDeploymentDescription"/>
-  <xsd:complexType name="Capability">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Capability" type="Deployment:Capability"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentPropertyDescription" type="Deployment:ComponentPropertyDescription"/>
-  <xsd:complexType name="ComponentPortDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="specificType" type="xsd:string"/>
-      <xsd:element name="supportedType" type="xsd:string"/>
-      <xsd:element name="provider" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentPortDescription" type="Deployment:ComponentPortDescription"/>
-  <xsd:complexType name="ComponentInterfaceDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>
-      <xsd:element name="specificType" type="xsd:string"/>
-      <xsd:element name="supportedType" type="xsd:string"/>
-      <xsd:element name="idlFile" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/>
-  <xsd:complexType name="ImplementationArtifactDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>
-      <xsd:element name="location" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ImplementationArtifactDescription" type="Deployment:ImplementationArtifactDescription"/>
-  <xsd:complexType name="MonolithicImplementationDescription">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="MonolithicImplementationDescription" type="Deployment:MonolithicImplementationDescription"/>
-  <xsd:complexType name="AssemblyPropertyMapping">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="AssemblyPropertyMapping" type="Deployment:AssemblyPropertyMapping"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SubcomponentPropertyReference" type="Deployment:SubcomponentPropertyReference"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SubcomponentPortEndpoint" type="Deployment:SubcomponentPortEndpoint"/>
-  <xsd:complexType name="AssemblyConnectionDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="AssemblyConnectionDescription" type="Deployment:AssemblyConnectionDescription"/>
-  <xsd:complexType name="SubcomponentInstantiationDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SubcomponentInstantiationDescription" type="Deployment:SubcomponentInstantiationDescription"/>
-  <xsd:complexType name="ComponentAssemblyDescription">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentAssemblyDescription" type="Deployment:ComponentAssemblyDescription"/>
-  <xsd:complexType name="ComponentImplementationDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>
-      <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription"/>
-      <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/>
-      <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentImplementationDescription" type="Deployment:ComponentImplementationDescription"/>
-  <xsd:complexType name="ComponentPackageReference">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentPackageReference" type="Deployment:ComponentPackageReference"/>
-  <xsd:complexType name="ComponentPackageDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentPackageDescription" type="Deployment:ComponentPackageDescription"/>
-  <xsd:complexType name="PackageConfiguration">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>
-      <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PackageConfiguration" type="Deployment:PackageConfiguration"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PackagedComponentImplementation" type="Deployment:PackagedComponentImplementation"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="NamedImplementationArtifact" type="Deployment:NamedImplementationArtifact"/>
-  <xsd:complexType name="ImplementationRequirement">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
-      <xsd:element name="resourcePort" type="xsd:string"/>
-      <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ImplementationRequirement" type="Deployment:ImplementationRequirement"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="RequirementSatisfier" type="Deployment:RequirementSatisfier"/>
-  <xsd:complexType name="SatisfierProperty">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SatisfierProperty" type="Deployment:SatisfierProperty"/>
-  <xsd:complexType name="Requirement">
-    <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Requirement" type="Deployment:Requirement"/>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <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 ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="TopLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/>
-  <xsd:simpleType name="TCKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="tk_null"/>
-      <xsd:enumeration value="tk_void"/>
-      <xsd:enumeration value="tk_short"/>
-      <xsd:enumeration value="tk_long"/>
-      <xsd:enumeration value="tk_ushort"/>
-      <xsd:enumeration value="tk_ulong"/>
-      <xsd:enumeration value="tk_float"/>
-      <xsd:enumeration value="tk_double"/>
-      <xsd:enumeration value="tk_boolean"/>
-      <xsd:enumeration value="tk_char"/>
-      <xsd:enumeration value="tk_octet"/>
-      <xsd:enumeration value="tk_any"/>
-      <xsd:enumeration value="tk_TypeCode"/>
-      <xsd:enumeration value="tk_Principal"/>
-      <xsd:enumeration value="tk_objref"/>
-      <xsd:enumeration value="tk_struct"/>
-      <xsd:enumeration value="tk_union"/>
-      <xsd:enumeration value="tk_enum"/>
-      <xsd:enumeration value="tk_string"/>
-      <xsd:enumeration value="tk_sequence"/>
-      <xsd:enumeration value="tk_array"/>
-      <xsd:enumeration value="tk_alias"/>
-      <xsd:enumeration value="tk_except"/>
-      <xsd:enumeration value="tk_longlong"/>
-      <xsd:enumeration value="tk_ulonglong"/>
-      <xsd:enumeration value="tk_longdouble"/>
-      <xsd:enumeration value="tk_wchar"/>
-      <xsd:enumeration value="tk_wstring"/>
-      <xsd:enumeration value="tk_wfixed"/>
-      <xsd:enumeration value="tk_value"/>
-      <xsd:enumeration value="tk_value_box"/>
-      <xsd:enumeration value="tk_native"/>
-      <xsd:enumeration value="tk_abstract_interface"/>
-      <xsd:enumeration value="tk_local_interface"/>
-      <xsd:enumeration value="tk_component"/>
-      <xsd:enumeration value="tk_home"/>
-      <xsd:enumeration value="tk_event"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ResourceUsageKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="None"/>
-      <xsd:enumeration value="InstanceUsesResource"/>
-      <xsd:enumeration value="ResourceUsesInstance"/>
-      <xsd:enumeration value="PortUsesResource"/>
-      <xsd:enumeration value="ResourceUsesPort"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="CCMComponentPortKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Facet"/>
-      <xsd:enumeration value="SimplexReceptacle"/>
-      <xsd:enumeration value="MultiplexReceptacle"/>
-      <xsd:enumeration value="EventEmitter"/>
-      <xsd:enumeration value="EventPublisher"/>
-      <xsd:enumeration value="EventConsumer"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="SatisfierPropertyKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Quantity"/>
-      <xsd:enumeration value="Capacity"/>
-      <xsd:enumeration value="Minimum"/>
-      <xsd:enumeration value="Maximum"/>
-      <xsd:enumeration value="Attribute"/>
-      <xsd:enumeration value="Selection"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:element name="Deployment">
-  <xsd:complexType>
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element ref="Deployment:Any"/>
-      <xsd:element ref="Deployment:DataType"/>
-      <xsd:element ref="Deployment:DataValue"/>
-      <xsd:element ref="Deployment:EnumType"/>
-      <xsd:element ref="Deployment:ObjrefType"/>
-      <xsd:element ref="Deployment:BoundedStringType"/>
-      <xsd:element ref="Deployment:FixedType"/>
-      <xsd:element ref="Deployment:ArrayType"/>
-      <xsd:element ref="Deployment:SequenceType"/>
-      <xsd:element ref="Deployment:AliasType"/>
-      <xsd:element ref="Deployment:StructType"/>
-      <xsd:element ref="Deployment:StructMemberType"/>
-      <xsd:element ref="Deployment:ValueType"/>
-      <xsd:element ref="Deployment:ValueMemberType"/>
-      <xsd:element ref="Deployment:UnionType"/>
-      <xsd:element ref="Deployment:UnionMemberType"/>
-      <xsd:element ref="Deployment:NamedValue"/>
-      <xsd:element ref="Deployment:Bridge"/>
-      <xsd:element ref="Deployment:Interconnect"/>
-      <xsd:element ref="Deployment:Node"/>
-      <xsd:element ref="Deployment:Resource"/>
-      <xsd:element ref="Deployment:SharedResource"/>
-      <xsd:element ref="Deployment:Domain"/>
-      <xsd:element ref="Deployment:PlanPropertyMapping"/>
-      <xsd:element ref="Deployment:PlanSubcomponentPropertyReference"/>
-      <xsd:element ref="Deployment:PlanSubcomponentPortEndpoint"/>
-      <xsd:element ref="Deployment:PlanConnectionDescription"/>
-      <xsd:element ref="Deployment:InstanceDeploymentDescription"/>
-      <xsd:element ref="Deployment:MonolithicDeploymentDescription"/>
-      <xsd:element ref="Deployment:ArtifactDeploymentDescription"/>
-      <xsd:element ref="Deployment:DeploymentPlan"/>
-      <xsd:element ref="Deployment:ResourceDeploymentDescription"/>
-      <xsd:element ref="Deployment:InstanceResourceDeploymentDescription"/>
-      <xsd:element ref="Deployment:ConnectionResourceDeploymentDescription"/>
-      <xsd:element ref="Deployment:Capability"/>
-      <xsd:element ref="Deployment:ComponentPropertyDescription"/>
-      <xsd:element ref="Deployment:ComponentPortDescription"/>
-      <xsd:element ref="Deployment:ComponentInterfaceDescription"/>
-      <xsd:element ref="Deployment:ImplementationArtifactDescription"/>
-      <xsd:element ref="Deployment:MonolithicImplementationDescription"/>
-      <xsd:element ref="Deployment:AssemblyPropertyMapping"/>
-      <xsd:element ref="Deployment:SubcomponentPropertyReference"/>
-      <xsd:element ref="Deployment:SubcomponentPortEndpoint"/>
-      <xsd:element ref="Deployment:AssemblyConnectionDescription"/>
-      <xsd:element ref="Deployment:SubcomponentInstantiationDescription"/>
-      <xsd:element ref="Deployment:ComponentAssemblyDescription"/>
-      <xsd:element ref="Deployment:ComponentImplementationDescription"/>
-      <xsd:element ref="Deployment:ComponentPackageReference"/>
-      <xsd:element ref="Deployment:ComponentPackageDescription"/>
-      <xsd:element ref="Deployment:PackageConfiguration"/>
-      <xsd:element ref="Deployment:PackagedComponentImplementation"/>
-      <xsd:element ref="Deployment:NamedImplementationArtifact"/>
-      <xsd:element ref="Deployment:ImplementationRequirement"/>
-      <xsd:element ref="Deployment:RequirementSatisfier"/>
-      <xsd:element ref="Deployment:SatisfierProperty"/>
-      <xsd:element ref="Deployment:Requirement"/>
-      <xsd:element ref="Deployment:Property"/>
-      <xsd:element ref="Deployment:ExternalReferenceEndpoint"/>
-      <xsd:element ref="Deployment:ComponentExternalPortEndpoint"/>
-      <xsd:element ref="Deployment:ImplementationDependency"/>
-      <xsd:element ref="Deployment:TopLevelPackageDescription"/>
-      <xsd:element ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
diff --git a/CIAO/docs/schema/Spec_Defined_XMI.xsd b/CIAO/docs/schema/Spec_Defined_XMI.xsd
deleted file mode 100644
index eac893f37c8..00000000000
--- a/CIAO/docs/schema/Spec_Defined_XMI.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?>
-<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'>
-    <xsd:attribute name="id" type="xsd:ID" />
-    <xsd:attributeGroup name="IdentityAttribs">
-        <xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" />
-        <xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" />
-    </xsd:attributeGroup>
-    <xsd:attributeGroup name="LinkAttribs">
-        <xsd:attribute name="href" type="xsd:string" use="optional" />
-        <xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" />
-    </xsd:attributeGroup>
-    <xsd:attributeGroup name="ObjectAttribs">
-        <xsd:attributeGroup ref="xmi:IdentityAttribs" />
-        <xsd:attributeGroup ref="xmi:LinkAttribs" />
-        <xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" />
-        <xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" />
-    </xsd:attributeGroup>
-    <xsd:complexType name="Extension">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-            <xsd:any processContents="lax" />
-        </xsd:choice>
-        <xsd:attribute ref="xmi:id" />
-        <xsd:attributeGroup ref="xmi:ObjectAttribs" />
-        <xsd:attribute name="extender" type="xsd:string" use="optional" />
-        <xsd:attribute name="extenderID" type="xsd:string" use="optional" />
-    </xsd:complexType>
-    <xsd:element name="Extension" type="xmi:Extension" />
-    <xsd:complexType name="Any">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-            <xsd:any processContents="skip" />
-        </xsd:choice>
-        <xsd:anyAttribute processContents="skip" />
-    </xsd:complexType>
-</xsd:schema>
diff --git a/CIAO/docs/schema/Task_Map.xsd b/CIAO/docs/schema/Task_Map.xsd
deleted file mode 100644
index 2138f082d48..00000000000
--- a/CIAO/docs/schema/Task_Map.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.vanderbilt.edu/SA-POP Task_Map.xsd" xmlns:SA-POP="http://www.vanderbilt.edu/SA-POP"
-  targetNamespace="http://www.vanderbilt.edu/SA-POP" elementFormDefault="qualified">
-  <!-- Simple types. -->
-  <xs:simpleType name="TaskID">
-    <xs:restriction base="xs:int">
-      <xs:minInclusive value="1" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="TaskImplID">
-    <xs:restriction base="xs:string" />
-  </xs:simpleType>
-  <xs:simpleType name="ResourceID">
-    <xs:restriction base="xs:string" />
-  </xs:simpleType>
-  <xs:simpleType name="ResourceKind">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="UNARY" />
-      <xs:enumeration value="DISCRETE" />
-      <xs:enumeration value="RESERVOIR" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ResourceValue">
-    <xs:restriction base="xs:int">
-      <xs:minInclusive value="0" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ImplParamID">
-    <xs:restriction base="xs:string" />
-  </xs:simpleType>
-  <xs:simpleType name="ImplParamKind">
-    <xs:restriction base="xs:string" />
-  </xs:simpleType>
-  <xs:simpleType name="ImplParamValue">
-    <xs:restriction base="xs:string" />
-  </xs:simpleType>
-  <xs:simpleType name="TimeValue">
-    <xs:restriction base="xs:int">
-      <!-- -1 indicates unknown/unconstrained time -->
-      <xs:minInclusive value="-1" />
-    </xs:restriction>
-  </xs:simpleType>
-  <!-- Complex types corresponding to IDL structures.
-       (resources, parameters, implementations, associations, and task map) -->
-  <xs:complexType name="Resource">
-    <xs:sequence>
-      <xs:element name="resourceID" type="SA-POP:ResourceID" />
-      <xs:element name="kind" type="SA-POP:ResourceKind" default="DISCRETE" />
-      <xs:element name="capacity" type="SA-POP:ResourceValue" default="100" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ImplParam">
-    <xs:sequence>
-      <xs:element name="paramID" type="SA-POP:ImplParamID" />
-      <xs:element name="kind" type="SA-POP:ImplParamKind" />
-      <xs:element name="value" type="SA-POP:ImplParamValue" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="TaskImpl">
-    <xs:sequence>
-      <xs:element name="implID" type="SA-POP:TaskImplID" />
-      <xs:element name="param" type="SA-POP:ImplParam" maxOccurs="unbounded" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="TaskToImpl">
-    <xs:sequence>
-      <xs:element name="taskID" type="SA-POP:TaskID" />
-      <xs:element name="implID" type="SA-POP:TaskImplID" />
-      <xs:element name="duration" type="SA-POP:TimeValue" default="-1" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ImplToResource">
-    <xs:sequence>
-      <xs:element name="implID" type="SA-POP:TaskImplID" />
-      <xs:element name="resourceID" type="SA-POP:ResourceID" />
-      <xs:element name="utilization" type="SA-POP:ResourceValue" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="TaskMap">
-    <xs:sequence>
-      <xs:element name="taskImpl" type="SA-POP:TaskImpl" maxOccurs="unbounded" />
-      <xs:element name="resource" type="SA-POP:Resource" maxOccurs="unbounded" />
-      <xs:element name="taskToImpl" type="SA-POP:TaskToImpl" maxOccurs="unbounded" />
-      <xs:element name="implToResource" type="SA-POP:ImplToResource" maxOccurs="unbounded" />
-    </xs:sequence>
-  </xs:complexType>
-  <!-- Top-level task map element. -->
-  <xs:element name="taskMap" type="SA-POP:TaskMap"></xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/CIAO/docs/schema/XMI.xsd b/CIAO/docs/schema/XMI.xsd
deleted file mode 100644
index afb17f9d3b5..00000000000
--- a/CIAO/docs/schema/XMI.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" ?>
-<!-- This is a slightly modified  XMI schema that has some elements not currently supported by XSC commented out -->
-<xsd:schema targetNamespace="http://www.omg.org/XMI" 
-            xmlns:xmi="http://www.omg.org/XMI" 
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'>
-    <xsd:attribute name="id" type="xsd:ID" />
-    <xsd:attributeGroup name="IdentityAttribs">
-        <xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" />
-        <xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" />
-    </xsd:attributeGroup>
-    <xsd:attributeGroup name="LinkAttribs">
-        <xsd:attribute name="href" type="xsd:string" use="optional" />
-        <xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" />
-    </xsd:attributeGroup>
-    <xsd:attributeGroup name="ObjectAttribs">
-        <xsd:attributeGroup ref="xmi:IdentityAttribs" />
-        <xsd:attributeGroup ref="xmi:LinkAttribs" />
-        <xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" />
-        <!-- <xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" /> -->
-    </xsd:attributeGroup>
-    <xsd:complexType name="Extension">
-<!--        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-            <xsd:any processContents="lax" />
-        </xsd:choice> -->
-        <xsd:attribute ref="xmi:id" />
-        <xsd:attributeGroup ref="xmi:ObjectAttribs" />
-        <xsd:attribute name="extender" type="xsd:string" use="optional" />
-        <xsd:attribute name="extenderID" type="xsd:string" use="optional" />
-    </xsd:complexType>
-    <xsd:element name="extension" type="xmi:Extension" />
-<!--    <xsd:complexType name="Any">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-            <xsd:any processContents="skip" />
-        </xsd:choice>
-        <xsd:anyAttribute processContents="skip" />
-    </xsd:complexType> -->
-</xsd:schema>
diff --git a/CIAO/docs/schema/ccd.xsd b/CIAO/docs/schema/ccd.xsd
deleted file mode 100644
index fcdac711b5a..00000000000
--- a/CIAO/docs/schema/ccd.xsd
+++ /dev/null
@@ -1,27 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-  <xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
-            
-  <xsd:complexType name="ComponentInterfaceDescription">
-    <xsd:choice minOccurs="0" maxOccurs="1">
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string" minOccurs="0"/>
-        <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>
-        <!-- @@ MAJO : HACK - SpecificType and SupportedType should be required! -->
-        <xsd:element name="specificType" type="xsd:string" minOccurs="0" />
-        <xsd:element name="supportedType" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="idlFile" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="port" type="Deployment:ComponentPortDescription" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="property" type="Deployment:ComponentPropertyDescription" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-    <xsd:attribute name="href" type="xsd:string" />
-  </xsd:complexType>
-</xsd:schema>
diff --git a/CIAO/docs/schema/cdd.xsd b/CIAO/docs/schema/cdd.xsd
deleted file mode 100644
index 3fe64120bfd..00000000000
--- a/CIAO/docs/schema/cdd.xsd
+++ /dev/null
@@ -1,60 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-<xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
-
-  <xsd:complexType name="Domain">
-    <xsd:sequence>
-      <xsd:element name="UUID" type="xsd:string" minOccurs="0" />       
-      <xsd:element name="label" type="xsd:string" minOccurs="0" />
-      <xsd:element name="node" type="Deployment:Node" maxOccurs="unbounded"/>
-      <xsd:element name="interconnect" type="Deployment:Interconnect" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="bridge" type="Deployment:Bridge" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="Bridge">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="label" type="xsd:string" minOccurs="0" />
-      <xsd:element name="connect" type="Deployment:Interconnect" maxOccurs="unbounded" />
-      <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" />      
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="Interconnect">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="label" type="xsd:string" minOccurs="0" />
-      <xsd:element name="connection" type="Deployment:Bridge" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="connect" type="Deployment:Node" maxOccurs="unbounded" />
-      <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" />      
-    </xsd:sequence>
-  </xsd:complexType>
-  
-  <xsd:complexType name="Node">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="label" type="xsd:string" minOccurs="0" />
-      <xsd:element name="connection" type="Deployment:Interconnect" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" />      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="SharedResource">
-    <xsd:sequence>
-      <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:sequence>
-  </xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/CIAO/docs/schema/cdp.xsd b/CIAO/docs/schema/cdp.xsd
deleted file mode 100644
index 2b798f3e43e..00000000000
--- a/CIAO/docs/schema/cdp.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-<xsd:include schemaLocation="ccd.xsd" />
-	<!-- Note:  name deploymentPlan should be DeploymentPlan, this is a hack to make XSC happy -->
-  <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" />     
-    <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" minOccurs="0" maxOccurs="unbounded" />
-    <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
-    <!-- potentially recursive, not used
-      <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
-    -->
-    <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element name="localityConstraint" type="Deployment:PlanLocality" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-
-</xsd:schema>
diff --git a/CIAO/docs/schema/ciaopolicy.xsd b/CIAO/docs/schema/ciaopolicy.xsd
deleted file mode 100644
index 93a7415c4b4..00000000000
--- a/CIAO/docs/schema/ciaopolicy.xsd
+++ /dev/null
@@ -1,607 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="www.dre.vanderbilt.edu"
-           xmlns:ciao="www.dre.vanderbilt.edu"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           elementFormDefault="qualified"
-           attributeFormDefault="unqualified">
-
-  <xs:element name="orbPolicies">
-    <xs:annotation>
-      <xs:documentation>
-        The root element of the schema. Contains zero or more policies.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="policy" type="ciao:policyType" maxOccurs="unbounded" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  
-  <xs:complexType name="policyType">
-    <xs:sequence>
-      <xs:choice>
-        <xs:element name="rebindPolicy" type="ciao:rebindPolicyType" />
-        <xs:element name="syncScopePolicy" type="ciao:syncScopePolicyType" />
-        <xs:element name="requestPriorityPolicy" type="ciao:requestPriorityPolicyType" />
-        <xs:element name="replyPriorityPolicy" type="ciao:replyPriorityPolicyType" />
-        <xs:element name="requestStartTimePolicy" type="ciao:requestStartTimePolicyType" />
-        <xs:element name="requestEndTimePolicy" type="ciao:requestEndTimePolicyType" />
-        <xs:element name="replyStartTimePolicy" type="ciao:replyStartTimePolicyType" />
-        <xs:element name="replyEndTimePolicy" type="ciao:replyEndTimePolicyType" />
-        <xs:element name="relativeRequestTimeoutPolicy" type="ciao:relativeRequestTimeoutPolicyType" />
-        <xs:element name="relativeRoundtripPolicy" type="ciao:relativeRoundtripPolicyType" />
-        <xs:element name="routingPolicy" type="ciao:routingPolicyType" />
-        <xs:element name="maxHopsPolicy" type="ciao:maxHopsPolicyType" />
-        <xs:element name="queueOrderPolicy" type="ciao:queueOrderPolicyType" />
-        <xs:element name="priorityModelPolicy" type="ciao:priorityModelPolicyType" />
-        <xs:element name="threadPoolPolicy" type="ciao:threadPoolPolicyType" />
-        <xs:element name="serverProtocolPolicy" type="ciao:serverProtocolPolicyType" />
-        <xs:element name="clientProtocolPolicy" type="ciao:clientProtocolPolicyType" />
-        <xs:element name="privateConnectionPolicy" type="ciao:privateConnectionPolicyType" />
-        <xs:element name="priorityBandedPolicy" type="ciao:priorityBandedPolicyType" />
-      </xs:choice>
-    </xs:sequence>
-  </xs:complexType>
-    
-  <xs:complexType name="policyBase" abstract="true">
-    <xs:annotation>
-      <xs:documentation>
-        This is the base policy type.  All policies
-        should be an extension of this type.  
-      </xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="override" type="ciao:overrideType" />
-      <xs:element name="scope" type="ciao:scopeType" />
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="scopeType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="ORB" />
-      <xs:enumeration value="THREAD" />
-      <xs:enumeration value="OBJECT" />
-      <xs:enumeration value="POA" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="policyIDType">
-    <xs:annotation>
-      <xs:documentation>
-        This type represents the policy ID.  
-        Need to add a restriction.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:integer">
-    </xs:restriction>
-  </xs:simpleType>
-  
-  <xs:simpleType name="overrideType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="SET_OVERRIDE" />
-      <xs:enumeration value="ADD_OVERRIDE" />
-    </xs:restriction>
-  </xs:simpleType>
-  
-
-  
-  <!-- The following are extensions of policyBase, one each for each policy 
-       we may want to group these into seperate schema documents, for our
-       own sanity.
-  -->
-  <!-- Policies 23 - 35 are defined in Messaging_No_Impl.pidl,
-       with the exception of policy 32, defined in Messaging_RT_Policy.pidl
-       and policy 24, defined in Messaging_SyncScope_Policy.pidl -->
-
-  <xs:complexType name="rebindPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents the RebindPolicy type, ID 23
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="rebindMode" type="ciao:rebindModeType" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="23" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:simpleType name="rebindModeType">
-    <xs:annotation>
-      <xs:documentation>
-        Note:  This is not strictly represented in the pidl as an enum,
-        but that appears to be the intent of the way it is declared.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="TRANSPARENT" />
-      <xs:enumeration value="NO_REBIND" />
-      <xs:enumeration value="NO_RECONNECT" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="syncScopePolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a SyncScopePolicyType, ID 24
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="synchronization" type="ciao:syncScopeType" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="25" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:simpleType name="syncScopeType">
-    <xs:annotation>
-      <xs:documentation>
-        Note: This was not declared an enum in Messaging_SyncScope_Policy.pidl,
-        but from the declaration, that appears to be the intent.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="SYNC_NONE" />
-      <xs:enumeration value="SYNC_WITH_TRANSPORT" />
-      <xs:enumeration value="SYNC_WITH_SERVER" />
-      <xs:enumeration value="SYNC_WITH_TARGET" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="requestPriorityPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a RequestPriorityPolicy, ID 25
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="priorityRange" type="ciao:priorityRangeType" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="25" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="replyPriorityPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a ReplyPriorityPolicy, ID 26
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="priorityRange" type="ciao:priorityRangeType" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="26" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="priorityRangeType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a PriorityRange struct defined in Messaging_No_Impl.pidl
-      </xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="min" type="xs:integer" />
-      <xs:element name="max" type="xs:integer" />
-    </xs:sequence>
-  </xs:complexType>
-  
-  
-  <xs:complexType name="requestStartTimePolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a RequestStartTimePolicy, ID 27
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="startTime" type="ciao:utcTime" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="27" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  
-  <xs:complexType name="requestEndTimePolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a RequestEndTimePolicy, ID 28
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="endTime" type="ciao:utcTime" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="28" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-
-  <xs:complexType name="replyStartTimePolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a ReplyStartTimePolicy, ID 29
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="startTime" type="ciao:utcTime" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="29" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-
-  <xs:complexType name="replyEndTimePolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a ReplyEndTimePolicy, ID 30
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="endTime" type="ciao:utcTime" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="30" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="utcTime">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a TimeBase::UtcT struct, defined in tao/TimeBase.pidl
-      </xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="time" type="xs:integer" />
-      <xs:element name="inaccLo" type="xs:integer" />
-      <xs:element name="inaccHi" type="xs:integer" />
-      <xs:element name="tdf" type="xs:integer" />
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="relativeRequestTimeoutPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a RelativeRequestTimeoutPolicy, ID 31.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="relativeExpiry" type="xs:integer" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="31" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="relativeRoundtripPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a RelativeRoundtripPolicy, ID 32
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="relativeExpiry" type="xs:integer" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="32" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="routingPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a RoutingPolicy, ID 33
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="routingTypeRangeMin" type="ciao:routingType" />
-          <xs:element name="routingTypeRangeMax" type="ciao:routingType" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="33" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:simpleType name="routingType">
-    <xs:annotation>
-      <xs:documentation>
-        Note: This is not explicitly set up as an enum in Messaging_No_Impl.pidl,
-        but that appears to be the intent from the declaration.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="ROUTE_NONE" />
-      <xs:enumeration value="ROUTE_FORWARD" />
-      <xs:enumeration value="ROUTE_STORE_AND_FORWARD" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="maxHopsPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a MaxHopsPolicy, ID 34
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="maxHops" type="xs:integer" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="34" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="queueOrderPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents a QueueOrderPolicy, ID 35
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="allowedOrders" type="ciao:ordersType" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="35" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:simpleType name="ordersType">
-    <xs:annotation>
-      <xs:documentation>
-        Note: This is not explicitly declared to be an enum in Messaging_No_Impl.pidl,
-        but that appears to be the intent from the declaration.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="ORDER_ANY" />
-      <xs:enumeration value="ORDER_TEMPORAL" />
-      <xs:enumeration value="ORDER_PRIORITY" />
-      <xs:enumeration value="ORDER_DEADLINE" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <!-- Policies 40 - 45 are defined in RTCORBA.pidl -->
-  <!-- priorityModelPolicy -->
-  <xs:complexType name="priorityModelPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents the Priority Model Policy, ID 40
-      </xs:documentation>
-    </xs:annotation>
-    
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="priorityModel" type="ciao:priorityModelType" />
-          <xs:element name="serverPriority" type="xs:integer" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="40" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:simpleType name="priorityModelType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="CLIENT_PROPAGATED" />
-      <xs:enumeration value="SERVER_DECLARED" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <!-- threadPoolPolicy -->
-
-  <xs:complexType name="threadPoolPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents the ThreadPool policy, ID 41
-      </xs:documentation>
-    </xs:annotation>
-    
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="threadPoolID" type="xs:integer" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="41" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  
-  <!-- serverProtocolPolicy -->
-
-  <xs:complexType name="serverProtocolPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents the Server Protocol policy, ID 42
-      </xs:documentation>
-    </xs:annotation>
-    
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="protocol" type="ciao:protocolType"
-                      minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="42" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  
-  <!-- clientProtocolPolicy -->
-  <xs:complexType name="clientProtocolPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents the Client Protocol policy, ID 43
-      </xs:documentation>
-    </xs:annotation>
-    
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="protocol" type="ciao:protocolType"
-                      minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="43" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-
-  <!-- Protocol definitions for client and server Protocol properties types. -->
-  <xs:complexType name="protocolType">
-    <xs:sequence>
-      <xs:element name="protocolType" type="xs:integer" />
-      <xs:element name="orbProtocolProperties" type="ciao:protocolPropertyType" />
-      <xs:element name="transportProtocolProperties" type="ciao:protocolPropertyType" />
-    </xs:sequence>
-  </xs:complexType>
-  
-  <xs:complexType name="protocolPropertyType">
-    <xs:sequence>
-      <xs:choice>
-        <xs:element name="tcpProtocolProperties" type="ciao:tcpProtocolPropertiesType" />
-        <xs:element name="giopProtocolProperties" type="ciao:giopProtocolPropertiesType" />
-        <xs:element name="unixDomainProtocolProperties" type="ciao:unixDomainProtocolPropertiesType" />
-        <xs:element name="sharedMemoryProtocolProperties" type="ciao:sharedMemoryProtocolPropertiesType" />
-      </xs:choice>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="protocolPropertyBase" abstract="true">
-    <xs:annotation>
-      <xs:documentation>
-        Base type for all protocol properties.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:attribute name="type" type="xs:string" use="required" />
-  </xs:complexType>
-  
-  <xs:complexType name="tcpProtocolPropertiesType">
-    <xs:complexContent>
-      <xs:extension base="ciao:protocolPropertyBase">
-        <xs:sequence>
-          <xs:element name="sendBufferSize" type="xs:integer" />
-          <xs:element name="recvBufferSize" type="xs:integer" />
-          <xs:element name="keepAlive" type="xs:boolean" />
-          <xs:element name="dontRoute" type="xs:boolean" />
-          <xs:element name="noDelay" type="xs:boolean" />
-          <xs:element name="enableNetworkPriority" type="xs:boolean" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="giopProtocolPropertiesType">
-    <xs:complexContent>
-      <xs:extension base="ciao:protocolPropertyBase" />
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="unixDomainProtocolPropertiesType">
-    <xs:complexContent>
-      <xs:extension base="ciao:protocolPropertyBase">
-        <xs:sequence>
-          <xs:element name="sendBufferSize" type="xs:integer" />
-          <xs:element name="recvBufferSize" type="xs:integer" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="sharedMemoryProtocolPropertiesType">
-    <xs:complexContent>
-      <xs:extension base="ciao:protocolPropertyBase">
-        <xs:sequence>
-          <xs:element name="preallocateBufferSize" type="xs:integer" />
-          <xs:element name="mmapFilename" type="xs:string" />
-          <xs:element name="mmapLockname" type="xs:string" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-        
-  <!-- TODO:  Provide other protocolProperties types -->
-
-  <!-- privateConnectionPolicy -->
-  <xs:complexType name="privateConnectionPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        privateConnectionPolicy extension of policyBase, ID 44
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <!-- empty -->
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="44" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  
-  <!-- priorityBandedPolicy -->
-  <xs:complexType name="priorityBandedPolicyType">
-    <xs:annotation>
-      <xs:documentation>
-        priorityBandedPolicy extension of policyBase, ID 45
-      </xs:documentation>
-    </xs:annotation>
-    
-    <xs:complexContent>
-      <xs:extension base="ciao:policyBase">
-        <xs:sequence>
-          <xs:element name="priorityBand" type="ciao:priorityBandType"
-                      minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="45" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  
-  <xs:complexType name="priorityBandType">
-    <xs:annotation>
-      <xs:documentation>
-        Represents the PriorityBand struct for the priorityBandedPolicy element.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="low" type="xs:integer" />
-      <xs:element name="high" type="xs:integer" />
-    </xs:sequence>
-  </xs:complexType>
-  
-
-
-</xs:schema>
\ No newline at end of file
diff --git a/CIAO/docs/schema/cid.xsd b/CIAO/docs/schema/cid.xsd
deleted file mode 100644
index 1d46d467190..00000000000
--- a/CIAO/docs/schema/cid.xsd
+++ /dev/null
@@ -1,89 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-  <xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
-  <xsd:include schemaLocation="ccd.xsd" />
-  <xsd:include schemaLocation="iad.xsd" />
-  <xsd:include schemaLocation="pcd.xsd" />
-  <xsd:include schemaLocation="cpd.xsd" />
-  
-  <xsd:complexType name="ComponentPackageReference">
-    <xsd:sequence>
-      <xsd:element name="requiredUUID" type="xsd:string" minOccurs="0" />
-      <xsd:element name="requiredName" type="xsd:string" minOccurs="0" />
-      <xsd:element name="requiredType" type="Deployment:ComponentInterfaceDescription"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="SubcomponentInstantiationDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription" minOccurs="0" />
-      <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration" minOccurs="0" />
-      <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="referencedPackage" type="Deployment:ComponentPackageReference" minOccurs="0"/>
-      <xsd:element name="importedPackage" type="Deployment:ComponentPackageImport" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="SubcomponentPropertyReference">
-    <xsd:sequence>
-      <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:IdRef"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="AssemblyPropertyMapping">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ComponentAssemblyDescription">
-    <xsd:sequence>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- <xsd:element name="locality" type="Deployment:Locality" minOccurs="0" maxOccurs="unbounded" /> -->
-      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="MonolithicImplementationDescription">
-    <xsd:sequence>
-      <xsd:element name="nodeExecParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="componentExecParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ComponentImplementationDescription">
-    <xsd:choice minOccurs="0" maxOccurs="1">
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string" minOccurs="0" />
-        <xsd:element name="UUID" type="xsd:string" minOccurs="0" />
-        <!-- @@ MAJO : Hack: Implements should be required. -->
-        <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription" minOccurs="0" />
-        <xsd:choice>
-          <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/>
-          <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/>
-        </xsd:choice>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element name="capability" type="Deployment:Capability" minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-    <xsd:attribute name="href" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-
-
-</xsd:schema>
diff --git a/CIAO/docs/schema/cpd.xsd b/CIAO/docs/schema/cpd.xsd
deleted file mode 100644
index ab976dceb72..00000000000
--- a/CIAO/docs/schema/cpd.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-            <xsd:include schemaLocation="cid.xsd" />
-            <xsd:include schemaLocation="ccd.xsd" />
-
-  <xsd:complexType name="PackagedComponentImplementation">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <!-- @@ recursive CPD->PCI->CID->CAD->SID->CPD -->
-      <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ComponentPackageDescription">
-    <xsd:choice minOccurs="0" maxOccurs="1">
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string" minOccurs="0" />
-        <xsd:element name="UUID" type="xsd:string" minOccurs="0" />
-        <!-- @@MAJO - This is a hack, realizes is required. -->
-        <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" />
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation" maxOccurs="unbounded" />
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-    <xsd:attribute name="href" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/CIAO/docs/schema/iad.xsd b/CIAO/docs/schema/iad.xsd
deleted file mode 100644
index 2f910b5d333..00000000000
--- a/CIAO/docs/schema/iad.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-<xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
-
-  <xsd:complexType name="NamedImplementationArtifact">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <!-- @@ recursive NIA->IAD->NIA -->
-      <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ImplementationArtifactDescription">
-    <xsd:choice minOccurs="0" maxOccurs="1">
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string" minOccurs="0" />
-        <xsd:element name="UUID" type="xsd:string" minOccurs="0" />
-        <xsd:element name="location" type="xsd:string" maxOccurs="unbounded"/>
-        <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" />
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-    <xsd:attribute name="href" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/CIAO/docs/schema/pcd.xsd b/CIAO/docs/schema/pcd.xsd
deleted file mode 100644
index 5c7772f7d85..00000000000
--- a/CIAO/docs/schema/pcd.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-  <xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
-  <xsd:include schemaLocation="cpd.xsd" />
-  
-  <xsd:complexType name="ComponentPackageImport">
-    <xsd:sequence>
-      <xsd:element name="location" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="PackageConfiguration">
-    <xsd:choice>
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string" minOccurs="0" />
-        <xsd:element name="UUID" type="xsd:string" minOccurs="0" />
-        <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription" minOccurs="0" />
-        <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration" minOccurs="0" />
-        <xsd:element name="importedPackage" type="Deployment:ComponentPackageImport" minOccurs="0" />
-        <xsd:element name="referencedPackage" type="Deployment:ComponentPackageReference" minOccurs="0"/>
-        <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string" minOccurs="0"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/CIAO/docs/schema/toplevel.xsd b/CIAO/docs/schema/toplevel.xsd
deleted file mode 100644
index a091c04bc23..00000000000
--- a/CIAO/docs/schema/toplevel.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-            <xsd:include schemaLocation="pcd.xsd" />
-
-  <xsd:complexType name="TopLevelPackageDescription">
-    <xsd:sequence>
-      <xsd:element name="basePackage" type="Deployment:PackageConfiguration" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/CIAO/docs/schema/unused_elements.xsd b/CIAO/docs/schema/unused_elements.xsd
deleted file mode 100644
index c1200b088e9..00000000000
--- a/CIAO/docs/schema/unused_elements.xsd
+++ /dev/null
@@ -1,161 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-<!-- VAULT 
-
-Place for strange things. Nobody knows what they are for...
-
--->
-
-<!--
-
-  <xsd:complexType name="EnumType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="xsd:string" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ObjrefType">
-    <xsd:sequence>
-      <xsd:element name="name" 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:choice>
-  </xsd:complexType>
-
-
-  <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:choice>
-  </xsd:complexType>
-
-
-  <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: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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="AliasType">
-    <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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="StructType">
-    <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: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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="ValueType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="ValueMemberType">
-    <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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="UnionType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <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:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="UnionMemberType">
-    <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:choice>
-  </xsd:complexType>
-
-
-  <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:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="PlanPropertyMapping">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <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:choice>
-  </xsd:complexType>
-
-
-  <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:choice>
-  </xsd:complexType>
-
--->
-
-<!--
-
-  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:choice>
-  </xsd:complexType>
-
--->
-
-</xsd:schema>
diff --git a/CIAO/docs/schema/xsc-banner.cpp b/CIAO/docs/schema/xsc-banner.cpp
deleted file mode 100644
index ecd90a877a6..00000000000
--- a/CIAO/docs/schema/xsc-banner.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-/* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * Changes made to this code will most likely be overwritten
- * when the handlers are recompiled.
- * 
- * If you find errors or feel that there are bugfixes to be made,
- * please contact the current XSC maintainer:
- *             Will Otte <wotte@dre.vanderbilt.edu>
- */
- 
diff --git a/CIAO/docs/schema/xsc-banner.h b/CIAO/docs/schema/xsc-banner.h
deleted file mode 100644
index 30370e90f40..00000000000
--- a/CIAO/docs/schema/xsc-banner.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * Changes made to this code will most likely be overwritten
- * when the handlers are recompiled.
- *
- * If you find errors or feel that there are bugfixes to be made,
- * please contact the current XSC maintainer:
- *             Will Otte <wotte@dre.vanderbilt.edu>
- */
-
-// Fix for Borland compilers, which seem to have a broken
-// <string> include.
-#ifdef __BORLANDC__
-# include <string.h>
-#endif
-