Checked in my recent changes and bug fixes for the RTEC and their filtering support, CIDL changes, and some IDL enhancements.

6 files changed, 1027 insertions, 5 deletions

diff --git a/examples/Hello/descriptors_events/ciao-events-example-with-filters.ced b/examples/Hello/descriptors_events/ciao-events-example-with-filters.ced
index 916a9e465c7..affc0e49dc7 100644
--- a/examples/Hello/descriptors_events/ciao-events-example-with-filters.ced
+++ b/examples/Hello/descriptors_events/ciao-events-example-with-filters.ced
@@ -18,13 +18,27 @@
       <source>Hello-Sender-idd_click_out</source>
       <source>Hello-Sender-idd-02_click_out</source>
     </filter>
-	  
+    
     <filter>
       <name>my_filter_02</name>
+      <type>DISJUNCTION</type>
+      <source>Hello-Sender-idd_click_out</source>
+    </filter>    
+	  
+    <filter>
+      <name>my_filter_03</name>
       <type>CONJUNCTION</type>
       <source>Hello-Sender-idd_click_out</source>
       <source>Hello-Sender-idd-02_click_out</source>
-     </filter>	  
+     </filter>	 
+     
+    <filter>
+      <name>my_filter_04</name>
+      <type>CONJUNCTION</type>
+      <source>Hello-Sender-idd_click_out</source>
+     </filter>	       
+     
+     
   </eventServiceConfiguration>
   
   <eventServiceConfiguration id="es_configuration-02">
diff --git a/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp b/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
index 9ad178d6dfc..e39c8ab6a2a 100644
--- a/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
+++ b/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
@@ -153,7 +153,7 @@
     <name>hello_event_ec_publisher_connection</name>
     <internalEndpoint>
       <portName>click_out</portName>
-      <kind>rtecEventPublisher</kind>
+      <kind>EventPublisher</kind>
       <instance>Hello-Sender-idd</instance>
     </internalEndpoint>
     <externalReference>
@@ -175,7 +175,7 @@
 	          <kind>tk_string</kind>
 	        </type>
 	        <value>
-	          <string>my_filter</string>
+	          <string>my_filter_01</string>
 	        </value>
         </value>	        
       </property>              
@@ -183,7 +183,7 @@
     
     <internalEndpoint>
       <portName>click_in</portName>
-      <kind>rtecEventConsumer</kind>
+      <kind>EventConsumer</kind>
       <instance>Hello-Receiver-idd</instance>
     </internalEndpoint>
     <externalReference>
diff --git a/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp b/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp
new file mode 100644
index 00000000000..7b382ef4720
--- /dev/null
+++ b/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp
@@ -0,0 +1,322 @@
+<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>Hello-DeploymentPlan</label>
+  <UUID>Hello_Plan_UUID_0001</UUID>
+  <!-- Could be ZERO  -->
+  <realizes>
+    <label>BasicSP-realizes-cid</label>
+    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
+    <specificType><!-- @@ What does here? --></specificType>
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <port>
+      <name>read_message</name>
+      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
+      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
+      <provider>false</provider>
+      <exclusiveProvider>false</exclusiveProvider>
+      <exclusiveUser>true</exclusiveUser>
+      <optional>false</optional>
+      <kind>SimplexReceptacle</kind>
+    </port>
+  </realizes>
+  
+  <implementation id="Hello-Sender-mdd">
+    <name>Hello-Sender-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Sender_exec</artifact>
+    <artifact>Hello-Sender_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="Hello-Receiver-mdd">
+    <name>Hello-Receiver-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Receiver_exec</artifact>
+    <artifact>Hello-Receiver_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+
+  <instance id="Hello-Sender-idd">
+    <name>Hello-Sender-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a test message passed in through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+        
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <instance id="Hello-Sender-idd-02">
+    <name>Hello-Sender-idd-02</name>
+    <node>ReceiverNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender_02.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a another message through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>  
+
+  <instance id="Hello-Receiver-idd">
+    <name>Hello-Receiver-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Receiver-mdd</implementation>
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection_02</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd-02</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>  
+
+
+  <connection>
+    <name>hello_event_ec_consumer_connection</name>
+    
+    <!-- The position of the below "deployRequirement" element matters     -->
+    <deployRequirement>
+      <resourceType>EventFilter</resourceType>
+      <name>my_filter_02</name>
+      <property>
+        <name>EventFilter</name>
+        <value>
+	        <type>
+	          <kind>tk_string</kind>
+	        </type>
+	        <value>
+	          <string>my_filter_02</string>
+	        </value>
+        </value>	        
+      </property>              
+    </deployRequirement>
+    
+    <internalEndpoint>
+      <portName>click_in</portName>
+      <kind>EventConsumer</kind>
+      <instance>Hello-Receiver-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="Hello-Sender_exec">
+    <name>Sender_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createSenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Sender_svnt">
+    <name>Sender_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_exec">
+    <name>Receiver_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_svnt">
+    <name>Receiver_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <infoProperty>
+    <name>CIAOEvents</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>ciao-events-example-with-filters.ced</string>
+      </value>
+    </value>
+  </infoProperty>  
+</Deployment:deploymentPlan>  
diff --git a/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp b/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp
new file mode 100644
index 00000000000..beb8af87f0d
--- /dev/null
+++ b/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp
@@ -0,0 +1,322 @@
+<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>Hello-DeploymentPlan</label>
+  <UUID>Hello_Plan_UUID_0001</UUID>
+  <!-- Could be ZERO  -->
+  <realizes>
+    <label>BasicSP-realizes-cid</label>
+    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
+    <specificType><!-- @@ What does here? --></specificType>
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <port>
+      <name>read_message</name>
+      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
+      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
+      <provider>false</provider>
+      <exclusiveProvider>false</exclusiveProvider>
+      <exclusiveUser>true</exclusiveUser>
+      <optional>false</optional>
+      <kind>SimplexReceptacle</kind>
+    </port>
+  </realizes>
+  
+  <implementation id="Hello-Sender-mdd">
+    <name>Hello-Sender-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Sender_exec</artifact>
+    <artifact>Hello-Sender_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="Hello-Receiver-mdd">
+    <name>Hello-Receiver-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Receiver_exec</artifact>
+    <artifact>Hello-Receiver_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+
+  <instance id="Hello-Sender-idd">
+    <name>Hello-Sender-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a test message passed in through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+        
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <instance id="Hello-Sender-idd-02">
+    <name>Hello-Sender-idd-02</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender_02.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a another message through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>  
+
+  <instance id="Hello-Receiver-idd">
+    <name>Hello-Receiver-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Receiver-mdd</implementation>
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection_02</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd-02</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>  
+
+
+  <connection>
+    <name>hello_event_ec_consumer_connection</name>
+    
+    <!-- The position of the below "deployRequirement" element matters     -->
+    <deployRequirement>
+      <resourceType>EventFilter</resourceType>
+      <name>my_filter_03</name>
+      <property>
+        <name>EventFilter</name>
+        <value>
+	        <type>
+	          <kind>tk_string</kind>
+	        </type>
+	        <value>
+	          <string>my_filter_03</string>
+	        </value>
+        </value>	        
+      </property>              
+    </deployRequirement>
+    
+    <internalEndpoint>
+      <portName>click_in</portName>
+      <kind>EventConsumer</kind>
+      <instance>Hello-Receiver-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="Hello-Sender_exec">
+    <name>Sender_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createSenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Sender_svnt">
+    <name>Sender_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_exec">
+    <name>Receiver_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_svnt">
+    <name>Receiver_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <infoProperty>
+    <name>CIAOEvents</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>ciao-events-example-with-filters.ced</string>
+      </value>
+    </value>
+  </infoProperty>  
+</Deployment:deploymentPlan>  
diff --git a/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp b/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp
new file mode 100644
index 00000000000..f01b77dcaac
--- /dev/null
+++ b/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp
@@ -0,0 +1,322 @@
+<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>Hello-DeploymentPlan</label>
+  <UUID>Hello_Plan_UUID_0001</UUID>
+  <!-- Could be ZERO  -->
+  <realizes>
+    <label>BasicSP-realizes-cid</label>
+    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
+    <specificType><!-- @@ What does here? --></specificType>
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <port>
+      <name>read_message</name>
+      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
+      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
+      <provider>false</provider>
+      <exclusiveProvider>false</exclusiveProvider>
+      <exclusiveUser>true</exclusiveUser>
+      <optional>false</optional>
+      <kind>SimplexReceptacle</kind>
+    </port>
+  </realizes>
+  
+  <implementation id="Hello-Sender-mdd">
+    <name>Hello-Sender-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Sender_exec</artifact>
+    <artifact>Hello-Sender_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="Hello-Receiver-mdd">
+    <name>Hello-Receiver-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Receiver_exec</artifact>
+    <artifact>Hello-Receiver_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+
+  <instance id="Hello-Sender-idd">
+    <name>Hello-Sender-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a test message passed in through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+        
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <instance id="Hello-Sender-idd-02">
+    <name>Hello-Sender-idd-02</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender_02.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a another message through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
+  </instance>  
+
+  <instance id="Hello-Receiver-idd">
+    <name>Hello-Receiver-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Receiver-mdd</implementation>
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+
+
+
+  <connection>
+    <name>hello_event_ec_publisher_connection_02</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd-02</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>  
+
+
+  <connection>
+    <name>hello_event_ec_consumer_connection</name>
+    
+    <!-- The position of the below "deployRequirement" element matters     -->
+    <deployRequirement>
+      <resourceType>EventFilter</resourceType>
+      <name>my_filter_04</name>
+      <property>
+        <name>EventFilter</name>
+        <value>
+	        <type>
+	          <kind>tk_string</kind>
+	        </type>
+	        <value>
+	          <string>my_filter_04</string>
+	        </value>
+        </value>	        
+      </property>              
+    </deployRequirement>
+    
+    <internalEndpoint>
+      <portName>click_in</portName>
+      <kind>EventConsumer</kind>
+      <instance>Hello-Receiver-idd</instance>
+    </internalEndpoint>
+    <externalReference>
+      <location>ES_01</location>
+    </externalReference>
+  </connection>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="Hello-Sender_exec">
+    <name>Sender_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createSenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Sender_svnt">
+    <name>Sender_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_exec">
+    <name>Receiver_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_svnt">
+    <name>Receiver_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <infoProperty>
+    <name>CIAOEvents</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>ciao-events-example-with-filters.ced</string>
+      </value>
+    </value>
+  </infoProperty>  
+</Deployment:deploymentPlan>  
diff --git a/examples/Hello/descriptors_events/run_NodeDaemons.pl b/examples/Hello/descriptors_events/run_NodeDaemons.pl
new file mode 100755
index 00000000000..6afe8d8b931
--- /dev/null
+++ b/examples/Hello/descriptors_events/run_NodeDaemons.pl
@@ -0,0 +1,42 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+$ACE_ROOT=$ENV{'ACE_ROOT'};
+
+use lib "/DOC_ROOT/ACE/bin";
+use PerlACE::Run_Test;
+
+$status = 0;
+$iorfile1 = PerlACE::LocalFile ("NodeApp1.ior");
+$iorfile2 = PerlACE::LocalFile ("NodeApp2.ior");
+
+#for ($iter = 0; $iter <= $#ARGV; $iter++) {
+#    if ($ARGV[$iter] eq "-h" || $ARGV[$iter] eq "-?") {
+#      print "Run_Test Perl script for NodeApplicationTest \n\n";
+#      print "run_test \n";
+#      print "\n";
+#      print "-h                  -- prints this information\n";
+#      exit 0;
+#  }
+#}
+
+
+unlink $iorfile1;
+unlink $iorfile2;
+
+$CIAO_ROOT=$ENV{'CIAO_ROOT'};
+
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+                             "-ORBEndpoint iiop://localhost:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
+
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+                             "-ORBEndpoint iiop://localhost:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
+
+$SV1->Spawn ();
+$SV2->Spawn ();
+
+sleep (99999999999);