summaryrefslogtreecommitdiff
path: root/CIAO/examples
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-11-22 12:57:15 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-11-22 12:57:15 +0000
commitaaa2075b2fd51ab161d08913e7ec0116e48d75ec (patch)
treea0ff8be077aba6565d44d1c18aa88a6f0bc9c857 /CIAO/examples
parent5f87cf32d567ce6bdb85a19b4d213313c79a9c62 (diff)
downloadATCD-aaa2075b2fd51ab161d08913e7ec0116e48d75ec.tar.gz
Mon Nov 22 12:52:02 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/DevGuideExamples/Messenger/descriptors/*: Some more work to get this example running again
Diffstat (limited to 'CIAO/examples')
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.ccd47
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.cid34
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.cpd15
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Exec.iad40
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Stub.iad30
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Svnt.iad40
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Application-flattened.cdp22
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Application.cdp26
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Application.pcd23
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Deployment.xsd776
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Domain.cdd24
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Libraries.iad11
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.ccd90
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.cid37
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.cpd15
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.ccd31
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.cid110
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.cpd13
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Exec.iad40
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Stub.iad25
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Svnt.iad40
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/README_15a5
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.ccd48
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.cid34
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.cpd11
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Exec.iad40
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Stub.iad29
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Svnt.iad40
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/XMI.xsd35
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/descriptors/package.tpd8
-rwxr-xr-xCIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl3
31 files changed, 11 insertions, 1731 deletions
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.ccd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.ccd
deleted file mode 100644
index 23ba49bb84c..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.ccd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentInterfaceDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Administrator Component</label>
- <specificType>IDL:Administrator:1.0</specificType>
- <supportedType>IDL:Administrator:1.0</supportedType>
- <idlFile>Administrator.idl</idlFile>
-
- <port>
- <name>runnables</name>
- <exclusiveProvider>false</exclusiveProvider>
- <exclusiveUser>true</exclusiveUser>
- <optional>true</optional>
- <provider>false</provider>
- <supportedType>IDL:Runnable:1.0</supportedType>
- <specificType>IDL:Runnable:1.0</specificType>
- <kind>MultiplexReceptacle</kind>
- </port>
-
- <port>
- <name>content</name>
- <exclusiveProvider>false</exclusiveProvider>
- <exclusiveUser>true</exclusiveUser>
- <optional>true</optional>
- <provider>false</provider>
- <supportedType>IDL:Publication:1.0</supportedType>
- <specificType>IDL:Publication:1.0</specificType>
- <kind>MultiplexReceptacle</kind>
- </port>
-
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This CCD describes the Administrator's interface</string>
- </value>
- </value>
- </infoProperty>
-
-</Deployment:ComponentInterfaceDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.cid b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.cid
deleted file mode 100644
index af9e9a4c677..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.cid
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Administrator Implementation</label>
- <implements href="Administrator.ccd"/>
- <monolithicImpl>
- <primaryArtifact>
- <name>Administrator_Stub</name>
- <referencedArtifact href="Administrator_Stub.iad"/>
- </primaryArtifact>
- <primaryArtifact>
- <name>Administrator_Svnt</name>
- <referencedArtifact href="Administrator_Svnt.iad"/>
- </primaryArtifact>
- <primaryArtifact>
- <name>Administrator_Exec</name>
- <referencedArtifact href="Administrator_Exec.iad"/>
- </primaryArtifact>
- </monolithicImpl>
- <configProperty>
- <name>ComponentIOR</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>Administrator.ior</string>
- </value>
- </value>
- </configProperty>
-</Deployment:ComponentImplementationDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.cpd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.cpd
deleted file mode 100644
index 972966462e6..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator.cpd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription
-xmlns:Deployment="http://www.omg.org/Deployment"
-xmlns:xmi="http://www.omg.org/XMI"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
- <label>Administrator Component</label>
- <realizes href="Administrator.ccd"/>
- <implementation>
- <name>AdministratorImpl</name>
- <referencedImplementation href="Administrator.cid"/>
- </implementation>
-
-</Deployment:ComponentPackageDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Exec.iad b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Exec.iad
deleted file mode 100644
index 81b7a16da7a..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Exec.iad
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Administrator Executor Artifact</label>
- <location>Administrator_exec</location>
- <dependsOn>
- <name>ACE/TAO/CIAO</name>
- <referencedArtifact href="Libraries.iad"/>
- </dependsOn>
- <dependsOn>
- <name>Administrator_Stub</name>
- <referencedArtifact href="Administrator_Stub.iad"/>
- </dependsOn>
- <execParameter>
- <name>entryPoint</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>createAdministratorHome_Impl</string>
- </value>
- </value>
- </execParameter>
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This IAD describes the Administrator's executor library</string>
- </value>
- </value>
- </infoProperty>
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Stub.iad b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Stub.iad
deleted file mode 100644
index 931fc371710..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Stub.iad
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Administrator Stub Artifact</label>
- <location>Administrator_stub</location>
- <dependsOn>
- <name>ACE/TAO/CIAO</name>
- <referencedArtifact href="Libraries.iad"/>
- </dependsOn>
- <dependsOn>
- <name>Messenger_Stub</name>
- <referencedArtifact href="Messenger_Stub.iad"/>
- </dependsOn>
-
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This IAD describes the Administrator's stub library</string>
- </value>
- </value>
- </infoProperty>
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Svnt.iad b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Svnt.iad
deleted file mode 100644
index 6774a107ef0..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Administrator_Svnt.iad
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Administrator Servant Artifact</label>
- <location>Administrator_svnt</location>
- <dependsOn>
- <name>ACE/TAO/CIAO</name>
- <referencedArtifact href="Libraries.iad"/>
- </dependsOn>
- <dependsOn>
- <name>Administrator_Stub</name>
- <referencedArtifact href="Administrator_Stub.iad"/>
- </dependsOn>
- <execParameter>
- <name>entryPoint</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>createAdministratorHome_Servant</string>
- </value>
- </value>
- </execParameter>
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This IAD describes the Administrator's servant library</string>
- </value>
- </value>
- </infoProperty>
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Application-flattened.cdp b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Application-flattened.cdp
index 21c143d3dfa..5bb031bccdb 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Application-flattened.cdp
+++ b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Application-flattened.cdp
@@ -152,13 +152,13 @@
<!-- artifact* (exec, svnt) -->
- <artifact id="Messenger_Stub">
+ <artifact xmi:id="Messenger_Stub">
<name>Messenger_Stub</name>
<source></source>
<node></node>
<location>Messenger_stub</location>
</artifact>
- <artifact id="Messenger_Svnt">
+ <artifact xmi:id="Messenger_Svnt">
<name>Messenger_Svnt</name>
<source></source>
<node></node>
@@ -171,7 +171,7 @@
</value>
</execParameter>
</artifact>
- <artifact id="Messenger_Exec">
+ <artifact xmi:id="Messenger_Exec">
<name>Messenger_Exec</name>
<source></source>
<node></node>
@@ -185,13 +185,13 @@
</execParameter>
</artifact>
- <artifact id="Receiver_Stub">
+ <artifact xmi:id="Receiver_Stub">
<name>Receiver_Stub</name>
<source></source>
<node></node>
<location>Receiver_stub</location>
</artifact>
- <artifact id="Receiver_Svnt">
+ <artifact xmi:id="Receiver_Svnt">
<name>Receiver_Svnt</name>
<source></source>
<node></node>
@@ -204,7 +204,7 @@
</value>
</execParameter>
</artifact>
- <artifact id="Receiver_Exec">
+ <artifact xmi:id="Receiver_Exec">
<name>Receiver_Exec</name>
<source></source>
<node></node>
@@ -218,13 +218,13 @@
</execParameter>
</artifact>
- <artifact id="Administrator_Stub">
+ <artifact xmi:id="Administrator_Stub">
<name>Administrator_Stub</name>
<source></source>
<node></node>
<location>Administrator_stub</location>
</artifact>
- <artifact id="Administrator_Svnt">
+ <artifact xmi:id="Administrator_Svnt">
<name>Administrator_Svnt</name>
<source></source>
<node></node>
@@ -237,7 +237,7 @@
</value>
</execParameter>
</artifact>
- <artifact id="Administrator_Exec">
+ <artifact xmi:id="Administrator_Exec">
<name>Administrator_Exec</name>
<source></source>
<node></node>
@@ -250,7 +250,5 @@
</value>
</execParameter>
</artifact>
-
-
-</Deployment:deploymentPlan>
+</Deployment:DeploymentPlan>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Application.cdp b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Application.cdp
deleted file mode 100644
index 0a1b5dc2573..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Application.cdp
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!-- $Id$ -->
-<Deployment:DeploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Messenger Deployment Plan</label>
- <instance xmi:id="Messenger_Instance_ID">
- <name>Messenger_Instance</name>
- <node>Messenger_Node</node>
- </instance>
- <instance xmi:id="First_Receiver_Instance_ID">
- <name>First_Receiver_Instance</name>
- <node>First_Receiver_Node</node>
- </instance>
- <instance xmi:id="Second_Receiver_Instance_ID">
- <name>Second_Receiver_Instance</name>
- <node>Second_Receiver_Node</node>
- </instance>
- <instance xmi:id="Administrator_Instance_ID">
- <name>Administrator_Instance</name>
- <node>Administrator_Node</node>
- </instance>
-</Deployment:DeploymentPlan>
-
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Application.pcd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Application.pcd
deleted file mode 100644
index 70635a4850b..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Application.pcd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:PackageConfiguration
-xmlns:Deployment="http://www.omg.org/Deployment"
-xmlns:xmi="http://www.omg.org/XMI"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Messenger Application Configuration</label>
- <basePackage href="MessengerAssembly.cpd"/>
-
- <!-- CIAO does not yet pay attention to this -->
- <configProperty>
- <name>subject</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>My Subject</string>
- </value>
- </value>
- </configProperty>
-</Deployment:PackageConfiguration>
-
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Deployment.xsd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Deployment.xsd
deleted file mode 100644
index ae9bc21965d..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Deployment.xsd
+++ /dev/null
@@ -1,776 +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" schemaLocation="XMI.xsd" />
-
-
- <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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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="UUID" type="xsd:string"/>
- <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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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:schema>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Domain.cdd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Domain.cdd
deleted file mode 100644
index 54a8c1f5a82..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Domain.cdd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Deployment:Domain
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-<label>Messenger Application Domain</label>
-<node>
- <name>Messenger_Node</name>
- <label>Messenger's Node</label>
-</node>
-<node>
- <name>First_Receiver_Node</name>
- <label>First Receiver's Node</label>
-</node>
-<node>
- <name>Second_Receiver_Node</name>
- <label>Second Receiver's Node</label>
-</node>
-<node>
- <name>Administrator_Node</name>
- <label>Administrator's Node</label>
-</node>
-</Deployment:Domain>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Libraries.iad b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Libraries.iad
deleted file mode 100644
index d861613c157..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Libraries.iad
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>ACE/TAO/CIAO Libraries</label>
- <location>$ACE_ROOT/lib/ACE</location>
- <location>$ACE_ROOT/lib/TAO</location>
- <location>$ACE_ROOT/lib/CIAO_Client</location>
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.ccd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.ccd
deleted file mode 100644
index cf79d7fb9f7..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.ccd
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentInterfaceDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Messenger Component</label>
- <specificType>IDL:Messenger:1.0</specificType>
- <idlFile>Messenger.idl</idlFile>
-
- <property>
- <name>subject</name>
- <type>
- <kind>tk_string</kind>
- </type>
- </property>
-
- <port>
- <name>control</name>
- <exclusiveProvider>false</exclusiveProvider>
- <exclusiveUser>false</exclusiveUser>
- <optional>true</optional>
- <provider>true</provider>
- <supportedType>IDL:Runnable:1.0</supportedType>
- <specificType>IDL:Runnable:1.0</specificType>
- <kind>Facet</kind>
- </port>
-
- <port>
- <name>content</name>
- <exclusiveProvider>false</exclusiveProvider>
- <exclusiveUser>false</exclusiveUser>
- <optional>true</optional>
- <provider>true</provider>
- <supportedType>IDL:Publication:1.0</supportedType>
- <specificType>IDL:Publication:1.0</specificType>
- <kind>Facet</kind>
- </port>
-
- <port>
- <name>message_publisher</name>
- <exclusiveProvider>false</exclusiveProvider>
- <exclusiveUser>false</exclusiveUser>
- <optional>true</optional>
- <provider>false</provider>
- <supportedType>IDL:Message:1.0</supportedType>
- <specificType>IDL:Message:1.0</specificType>
- <kind>EventPublisher</kind>
- </port>
-
- <port>
- <name>message_history</name>
- <exclusiveProvider>false</exclusiveProvider>
- <exclusiveUser>false</exclusiveUser>
- <optional>true</optional>
- <provider>true</provider>
- <supportedType>IDL:History:1.0</supportedType>
- <specificType>IDL:History:1.0</specificType>
- <kind>Facet</kind>
- </port>
-
- <!-- Default value for subject property, can be overridden.
- CIAO does not process this (yet)
- -->
- <configProperty>
- <name>subject</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>Default Subject</string>
- </value>
- </value>
- </configProperty>
-
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This CCD describes the Messenger's interface</string>
- </value>
- </value>
- </infoProperty>
-
-</Deployment:ComponentInterfaceDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.cid b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.cid
deleted file mode 100644
index c4e934f1ee2..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.cid
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Messenger Implementation</label>
- <implements href="Messenger.ccd"/>
- <monolithicImpl>
- <primaryArtifact>
- <name>Messenger_Stub</name>
- <referencedArtifact href="Messenger_Stub.iad"/>
- </primaryArtifact>
- <primaryArtifact>
- <name>Messenger_Svnt</name>
- <referencedArtifact href="Messenger_Svnt.iad"/>
- </primaryArtifact>
- <primaryArtifact>
- <name>Messenger_Exec</name>
- <referencedArtifact href="Messenger_Exec.iad"/>
- </primaryArtifact>
- </monolithicImpl>
-
- <configProperty>
- <name>ComponentIOR</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>Messenger.ior</string>
- </value>
- </value>
- </configProperty>
-
-</Deployment:ComponentImplementationDescription>
-
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.cpd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.cpd
deleted file mode 100644
index ee624b9bce5..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger.cpd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription
-xmlns:Deployment="http://www.omg.org/Deployment"
-xmlns:xmi="http://www.omg.org/XMI"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
- <label>Messenger Component</label>
- <realizes href="Messenger.ccd"/>
- <implementation>
- <name>MessengerImpl</name>
- <referencedImplementation href="Messenger.cid"/>
- </implementation>
-
-</Deployment:ComponentPackageDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.ccd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.ccd
deleted file mode 100644
index c048d99133d..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.ccd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentInterfaceDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Messenger Assembly</label>
-
- <property>
- <name>subject</name>
- <type>
- <kind>tk_string</kind>
- </type>
- </property>
-
- <!-- Default value for subject property, can be overridden.
- CIAO does not process this (yet)
- -->
- <configProperty>
- <name>subject</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>Default Subject</string>
- </value>
- </value>
- </configProperty>
-
-</Deployment:ComponentInterfaceDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.cid b/CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.cid
deleted file mode 100644
index bd0bf4e56ce..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.cid
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Messenger Assembly</label>
- <implements href="MessengerAssembly.ccd"/>
- <assemblyImpl>
- <instance xmi:id="a_Messenger">
- <name>Messenger_Instance</name>
- <package href="Messenger.cpd"/>
- </instance>
- <instance xmi:id="first_Receiver">
- <name>First_Receiver_Instance</name>
- <package href="Receiver.cpd"/>
- </instance>
- <instance xmi:id="second_Receiver">
- <name>Second_Receiver_Instance</name>
- <package href="Receiver.cpd"/>
- </instance>
- <instance xmi:id="a_Administrator">
- <name>Administrator_Instance</name>
- <package href="Administrator.cpd"/>
- </instance>
-
- <connection>
- <name>Messenger_to_First_Receiver_Publish</name>
- <internalEndpoint>
- <portName>message_publisher</portName>
- <instance xmi:idref="a_Messenger"/>
- </internalEndpoint>
- <internalEndpoint>
- <portName>message_consumer</portName>
- <instance xmi:idref="first_Receiver"/>
- </internalEndpoint>
- </connection>
- <connection>
- <name>Messenger_to_First_Receiver_History</name>
- <internalEndpoint>
- <portName>message_history</portName>
- <instance xmi:idref="a_Messenger"/>
- </internalEndpoint>
- <internalEndpoint>
- <portName>message_history</portName>
- <instance xmi:idref="first_Receiver"/>
- </internalEndpoint>
- </connection>
-
- <connection>
- <name>Messenger_to_Second_Receiver_Publisher</name>
- <internalEndpoint>
- <portName>message_publisher</portName>
- <instance xmi:idref="a_Messenger"/>
- </internalEndpoint>
- <internalEndpoint>
- <portName>message_consumer</portName>
- <instance xmi:idref="second_Receiver"/>
- </internalEndpoint>
- </connection>
- <connection>
- <name>Messenger_to_Second_Receiver_History</name>
- <internalEndpoint>
- <portName>message_history</portName>
- <instance xmi:idref="a_Messenger"/>
- </internalEndpoint>
- <internalEndpoint>
- <portName>message_history</portName>
- <instance xmi:idref="second_Receiver"/>
- </internalEndpoint>
- </connection>
-
- <connection>
- <name>Messenger_to_Administrator_Control</name>
- <internalEndpoint>
- <portName>control</portName>
- <instance xmi:idref="a_Messenger"/>
- </internalEndpoint>
- <internalEndpoint>
- <portName>runnables</portName>
- <instance xmi:idref="a_Administrator"/>
- </internalEndpoint>
- </connection>
- <connection>
- <name>Messenger_to_Administrator_Content</name>
- <internalEndpoint>
- <portName>content</portName>
- <instance xmi:idref="a_Messenger"/>
- </internalEndpoint>
- <internalEndpoint>
- <portName>content</portName>
- <instance xmi:idref="a_Administrator"/>
- </internalEndpoint>
- </connection>
-
- <!--
- Not sure that externalName has to match.
- Don't know if CIAO processes this yet.
- -->
- <externalProperty>
- <name>Subject Mapping</name>
- <externalName>subject</externalName>
- <delegatesTo>
- <propertyName>subject</propertyName>
- <instance xmi:idref="a_Messenger"/>
- </delegatesTo>
- </externalProperty>
-
- </assemblyImpl>
-</Deployment:ComponentImplementationDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.cpd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.cpd
deleted file mode 100644
index a719ad571c9..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.cpd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Messenger Assembly Package</label>
- <realizes href="MessengerAssembly.ccd"/>
- <implementation>
- <name>Messenger Application</name>
- <referencedImplementation href="MessengerAssembly.cid"/>
- </implementation>
-</Deployment:ComponentPackageDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Exec.iad b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Exec.iad
deleted file mode 100644
index 0b8cef2092c..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Exec.iad
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Messenger Executor Artifact</label>
- <location>Messenger_exec</location>
- <dependsOn>
- <name>ACE/TAO/CIAO</name>
- <referencedArtifact href="Libraries.iad"/>
- </dependsOn>
- <dependsOn>
- <name>Messenger_Stub</name>
- <referencedArtifact href="Messenger_Stub.iad"/>
- </dependsOn>
- <execParameter>
- <name>entryPoint</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>createMessengerHome_Impl</string>
- </value>
- </value>
- </execParameter>
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This IAD describes the Messenger's executor library</string>
- </value>
- </value>
- </infoProperty>
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Stub.iad b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Stub.iad
deleted file mode 100644
index 50447209f50..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Stub.iad
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Messenger Stub Artifact</label>
- <location>Messenger_stub</location>
- <dependsOn>
- <name>ACE/TAO/CIAO</name>
- <referencedArtifact href="Libraries.iad"/>
- </dependsOn>
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This IAD describes the Messenger's stub library</string>
- </value>
- </value>
- </infoProperty>
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Svnt.iad b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Svnt.iad
deleted file mode 100644
index 29b83d63e53..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Messenger_Svnt.iad
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Messenger Servant Artifact</label>
- <location>Messenger_svnt</location>
- <dependsOn>
- <name>ACE/TAO/CIAO</name>
- <referencedArtifact href="Libraries.iad"/>
- </dependsOn>
- <dependsOn>
- <name>Messenger_Stub</name>
- <referencedArtifact href="Messenger_Stub.iad"/>
- </dependsOn>
- <execParameter>
- <name>entryPoint</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>createMessengerHome_Servant</string>
- </value>
- </value>
- </execParameter>
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This IAD describes the Messenger's servant library</string>
- </value>
- </value>
- </infoProperty>
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/README_15a b/CIAO/examples/DevGuideExamples/Messenger/descriptors/README_15a
deleted file mode 100644
index ac466837dc4..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/README_15a
+++ /dev/null
@@ -1,5 +0,0 @@
-Deployment has changed in CIAO 0.5a (part of TAO 1.5a), now we use the plan
-launcher, which reads a single XML file called a flattened deployment plan.
-In our example, that file is Application-flattened.cdp. All the other XML
-files in this directory are here for reference and to correspond to the 1.4a
-TAO Developer's Guide, but they are not actually used.
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.ccd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.ccd
deleted file mode 100644
index 3094ae368dc..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.ccd
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentInterfaceDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Receiver Component</label>
- <specificType>IDL:Receiver:1.0</specificType>
- <supportedType>IDL:Receiver:1.0</supportedType>
- <idlFile>Receiver.idl</idlFile>
-
- <port>
- <name>message_consumer</name>
- <exclusiveProvider>false</exclusiveProvider>
- <exclusiveUser>false</exclusiveUser>
- <optional>false</optional>
- <provider>true</provider>
- <supportedType>IDL:Message:1.0</supportedType>
- <specificType>IDL:Message:1.0</specificType>
- <kind>EventConsumer</kind>
- </port>
-
- <port>
- <name>message_history</name>
- <exclusiveProvider>false</exclusiveProvider>
- <exclusiveUser>true</exclusiveUser>
- <optional>true</optional>
- <provider>false</provider>
- <supportedType>IDL:History:1.0</supportedType>
- <specificType>IDL:History:1.0</specificType>
- <kind>SimplexReceptacle</kind>
- </port>
-
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This CCD describes the Receiver's interface</string>
- </value>
- </value>
- </infoProperty>
-
-</Deployment:ComponentInterfaceDescription>
-
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.cid b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.cid
deleted file mode 100644
index c5c85d648da..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.cid
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Receiver Implementation</label>
- <implements href="Receiver.ccd"/>
- <monolithicImpl>
- <primaryArtifact>
- <name>Receiver_Stub</name>
- <referencedArtifact href="Receiver_Stub.iad"/>
- </primaryArtifact>
- <primaryArtifact>
- <name>Receiver_Svnt</name>
- <referencedArtifact href="Receiver_Svnt.iad"/>
- </primaryArtifact>
- <primaryArtifact>
- <name>Receiver_Exec</name>
- <referencedArtifact href="Receiver_Exec.iad"/>
- </primaryArtifact>
- </monolithicImpl>
- <configProperty>
- <name>ComponentIOR</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>Receiver.ior</string>
- </value>
- </value>
- </configProperty>
-</Deployment:ComponentImplementationDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.cpd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.cpd
deleted file mode 100644
index 8b8ff890fa2..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver.cpd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
- <label>Receiver Component</label>
- <realizes href="Receiver.ccd"/>
- <implementation>
- <name>ReceiverImpl</name>
- <referencedImplementation href="Receiver.cid"/>
- </implementation>
-
-</Deployment:ComponentPackageDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Exec.iad b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Exec.iad
deleted file mode 100644
index adcee103c94..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Exec.iad
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Receiver Executor Artifact</label>
- <location>Receiver_exec</location>
- <dependsOn>
- <name>ACE/TAO/CIAO</name>
- <referencedArtifact href="Libraries.iad"/>
- </dependsOn>
- <dependsOn>
- <name>Receiver_Stub</name>
- <referencedArtifact href="Receiver_Stub.iad"/>
- </dependsOn>
- <execParameter>
- <name>entryPoint</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>createReceiverHome_Impl</string>
- </value>
- </value>
- </execParameter>
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This IAD describes the Receiver's executor library</string>
- </value>
- </value>
- </infoProperty>
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Stub.iad b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Stub.iad
deleted file mode 100644
index 63d7e37cc8e..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Stub.iad
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Receiver Stub Artifact</label>
- <location>Receiver_stub</location>
- <dependsOn>
- <name>ACE/TAO/CIAO</name>
- <referencedArtifact href="Libraries.iad"/>
- </dependsOn>
- <dependsOn>
- <name>Messenger_Stub</name>
- <referencedArtifact href="Messenger_Stub.iad"/>
- </dependsOn>
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This IAD describes the Receiver's stub library</string>
- </value>
- </value>
- </infoProperty>
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Svnt.iad b/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Svnt.iad
deleted file mode 100644
index 8e3bf58d965..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/Receiver_Svnt.iad
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <label>Receiver Servant Artifact</label>
- <location>Receiver_svnt</location>
- <dependsOn>
- <name>ACE/TAO/CIAO</name>
- <referencedArtifact href="Libraries.iad"/>
- </dependsOn>
- <dependsOn>
- <name>Receiver_Stub</name>
- <referencedArtifact href="Receiver_Stub.iad"/>
- </dependsOn>
- <execParameter>
- <name>entryPoint</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>createReceiverHome_Servant</string>
- </value>
- </value>
- </execParameter>
- <!-- infoProperty elements are optional, and are non-functional -->
- <infoProperty>
- <name>comment</name>
- <value>
- <type>
- <kind>tk_string</kind>
- </type>
- <value>
- <string>This IAD describes the Receiver's servant library</string>
- </value>
- </value>
- </infoProperty>
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/XMI.xsd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/XMI.xsd
deleted file mode 100644
index f4adac91934..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/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/examples/DevGuideExamples/Messenger/descriptors/package.tpd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/package.tpd
deleted file mode 100644
index f481b6bd789..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/package.tpd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:TopLevelPackageDescription
-xmlns:Deployment="http://www.omg.org/Deployment"
-xmlns:xmi="http://www.omg.org/XMI"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
- <package href="Application.pcd"/>
-</Deployment:TopLevelPackageDescription>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
index 48030e8b029..5a683f72a4e 100755
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
+++ b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
@@ -21,8 +21,7 @@ $tg->DeleteFile ($plior);
$CIAO_ROOT = $ENV{'CIAO_ROOT'};
$DANCE_ROOT = $ENV{'DANCE_ROOT'};
-$NA = $tg->CreateProcess ("$CIAO_ROOT/bin/ciao_componentserver");
-$NA_cmd = $NA->Executable ();
+$NA_cmd = $tg->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
$NA1 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_node_manager",
"-ORBEndpoint iiop://localhost:11000 -s $NA_cmd -n Administrator_Node");