Mon Jun 28 09:34:25 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp:
          Added filter_config to these tests.

        * tutorials/Quoter/Simple/descriptors/run_test.pl:
          Resolved script error.

8 files changed, 262 insertions, 75 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 90108a54fa7..3edde351534 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,16 @@
+Mon Jun 28 09:34:25 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp:
+          Added filter_config to these tests.
+
+        * tutorials/Quoter/Simple/descriptors/run_test.pl:
+          Resolved script error.
+
 Mon Jun 28 09:35:04 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
index 78a3f9f2035..d2b5b4711df 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
@@ -13,12 +13,14 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl
   Receiver_exec_i::Receiver_exec_i (void)
     : //DDS_Get
       getter_ok_ (false),
-      getter_dds_data_reader_ok_ (false),
       getter_reader_ok_ (false),
+      getter_dds_data_reader_ok_ (false),
+      getter_filter_config_ok_ (false),
       //DDS_Listen
       listen_data_control_ok_ (false),
       listen_reader_ok_ (false),
       listen_dds_data_reader_ok_ (false),
+      listen_filter_config_ok_ (false),
       //Provides
       listen_port_status_created_ (false),
       get_port_status_created_ (false),
@@ -79,44 +81,61 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl
   Receiver_exec_i::configuration_complete (void)
   {
     //DDS_Get
-    this->getter_getter_ =
-        this->context_->get_connection_info_get_fresh_data ();
-    if (! ::CORBA::is_nil (this->getter_getter_))
+    ::Event_ConnectionConnector::Getter_var getter_getter =
+      this->context_->get_connection_info_get_fresh_data ();
+    if (! ::CORBA::is_nil (getter_getter))
       {
         this->getter_ok_ = true;
       }
-    this->getter_dds_data_reader_ =
-        this->context_->get_connection_info_get_dds_entity ();
-    if (! ::CORBA::is_nil (this->getter_dds_data_reader_))
+    ::DDS::DataReader_var getter_dds_data_reader =
+      this->context_->get_connection_info_get_dds_entity ();
+    if (! ::CORBA::is_nil (getter_dds_data_reader))
       {
         this->getter_dds_data_reader_ok_ = true;
       }
-    this->getter_reader_ =
-        this->context_->get_connection_info_get_data ();
-    if (! ::CORBA::is_nil (this->getter_reader_))
+
+    ::Event_ConnectionConnector::Reader_var getter_reader =
+      this->context_->get_connection_info_get_data ();
+    if (! ::CORBA::is_nil (getter_reader))
       {
         this->getter_reader_ok_ = true;
       }
-    //DDS_Listen
-    this->listen_data_control_ =
-        this->context_->get_connection_info_listen_data_control ();
 
-    if (! ::CORBA::is_nil (this->listen_data_control_))
+    ::CCM_DDS::ContentFilterSetting_var getter_filter_config =
+      this->context_->get_connection_info_get_filter_config ();
+    if (! ::CORBA::is_nil (getter_filter_config))
+      {
+        this->getter_filter_config_ok_ = true;
+      }
+
+    //DDS_Listen
+    ::CCM_DDS::DataListenerControl_var listen_data_control =
+      this->context_->get_connection_info_listen_data_control ();
+    if (! ::CORBA::is_nil (listen_data_control))
       {
         this->listen_data_control_ok_ = true;
       }
-    this->listen_reader_ =
-        this->context_->get_connection_info_listen_data ();
-    if (! ::CORBA::is_nil (this->listen_reader_))
+
+    ::Event_ConnectionConnector::Reader_var listen_reader =
+      this->context_->get_connection_info_listen_data ();
+    if (! ::CORBA::is_nil (listen_reader))
       {
         this->listen_reader_ok_ = true;
       }
-    this->listen_dds_data_reader_ =
-        this->context_->get_connection_info_listen_dds_entity ();
-    if (! ::CORBA::is_nil (this->listen_dds_data_reader_))
+
+    ::DDS::DataReader_var listen_dds_data_reader =
+      this->context_->get_connection_info_listen_dds_entity ();
+    if (! ::CORBA::is_nil (listen_dds_data_reader))
       {
         this->listen_dds_data_reader_ok_ = true;
       }
+
+    ::CCM_DDS::ContentFilterSetting_var listen_filter_config =
+      this->context_->get_connection_info_listen_filter_config ();
+    if (! ::CORBA::is_nil (listen_filter_config))
+      {
+        this->listen_filter_config_ok_ = true;
+      }
   }
 
   void
@@ -157,6 +176,14 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl
       {
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Get passed\n")));
       }
+    if (!this->getter_filter_config_ok_)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Get failed\n")));
+      }
+    else
+      {
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Get passed\n")));
+      }
     //DDS_Listen
     if (!this->listen_data_control_ok_)
       {
@@ -182,6 +209,14 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl
       {
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get dds reader of DDS_Listen passed\n")));
       }
+    if (!this->listen_filter_config_ok_)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Listen failed\n")));
+      }
+    else
+      {
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Listen passed\n")));
+      }
     //Provides
     if (!this->raw_listener_created_)
       {
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
index 281575151b0..5f8e321001d 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
@@ -54,23 +54,17 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl
 
   private:
     ::Event_Connection_Test::CCM_Receiver_Context_var context_;
-    //DDS_Get
-    ::Event_ConnectionConnector::Getter_var getter_getter_;
-    ::DDS::DataReader_var getter_dds_data_reader_;
-    ::Event_ConnectionConnector::Reader_var getter_reader_;
 
     bool getter_ok_;
-    bool getter_dds_data_reader_ok_;
     bool getter_reader_ok_;
+    bool getter_dds_data_reader_ok_;
+    bool getter_filter_config_ok_;
 
     //DDS_Listen
-    ::CCM_DDS::DataListenerControl_var listen_data_control_;
-    ::Event_ConnectionConnector::Reader_var listen_reader_;
-    ::DDS::DataReader_var listen_dds_data_reader_;
-
     bool listen_data_control_ok_;
     bool listen_reader_ok_;
     bool listen_dds_data_reader_ok_;
+    bool listen_filter_config_ok_;
 
     //Provide checks
     bool listen_port_status_created_;
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp
index 4fae896da10..1702904554d 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp
@@ -312,6 +312,26 @@
   </connection>
 
   <connection>
+    <name>listen_filter_config</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_listen_filter_config</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>push_consumer_filter_config</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
     <name>getter_portstatuslistener</name>
     <deployRequirement>
       <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
@@ -392,6 +412,26 @@
   </connection>
 
   <connection>
+    <name>getter_filter_config</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_get_filter_config</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>pull_consumer_filter_config</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
     <name>connector_status_listener</name>
     <deployRequirement>
       <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
index 464cecd6d98..e316ec776fe 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
@@ -16,18 +16,22 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
     : //DDS_Read
       reader_data_ok_ (false),
       reader_dds_entity_ok_ (false),
+      reader_filter_config_ok_ (false),
       //DDS_Get
       getter_data_ok_ (false),
       getter_fresh_data_ok_ (false),
       getter_dds_entity_ok_ (false),
+      getter_filter_config_ok_ (false),
       //DDS_Listen
       listen_data_ok_ (false),
       listen_data_control_ok_ (false),
       listen_dds_entity_ok_ (false),
+      listen_filter_config_ok_ (false),
       //DDS_StateListen
       statelisten_data_ok_ (false),
       statelisten_data_control_ok_ (false),
       statelisten_dds_entity_ok_ (false),
+      statelisten_filter_config_ok_ (false),
       //Provides for DDS_Read
       reader_port_status_created_ (false),
       //Provides for DDS_Get
@@ -111,46 +115,58 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
   Receiver_exec_i::configuration_complete (void)
   {
     //DDS_Read
-    this->reader_data_ =
+    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var reader_data =
       this->context_->get_connection_info_read_data ();
-    this->reader_data_ok_ = ! ::CORBA::is_nil (this->reader_data_);
+    this->reader_data_ok_ = ! ::CORBA::is_nil (reader_data);
 
-    this->reader_dds_entity_ =
+    ::DDS::DataReader_var reader_dds_entity =
       this->context_->get_connection_info_read_dds_entity ();
-    this->reader_dds_entity_ok_ = ! ::CORBA::is_nil (this->reader_dds_entity_);
+    this->reader_dds_entity_ok_ = ! ::CORBA::is_nil (reader_dds_entity);
+    ::CCM_DDS::ContentFilterSetting_var reader_filter_config =
+      this->context_->get_connection_info_read_filter_config ();
+    this->reader_filter_config_ok_ = ! ::CORBA::is_nil (reader_filter_config);
 
     //DDS_Get
-    this->getter_data_ =
+    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var getter_data =
       this->context_->get_connection_info_get_data ();
-    this->getter_data_ok_ = ! ::CORBA::is_nil (this->getter_data_);
-    this->getter_fresh_data_ =
+    this->getter_data_ok_ = ! ::CORBA::is_nil (getter_data);
+    ::State_Connection_Test::State_ConnectionTestConnector::Getter_var getter_fresh_data =
       this->context_->get_connection_info_get_fresh_data ();
-    this->getter_fresh_data_ok_ = ! ::CORBA::is_nil (this->getter_fresh_data_);
-    this->getter_dds_entity_ =
+    this->getter_fresh_data_ok_ = ! ::CORBA::is_nil (getter_fresh_data);
+    ::DDS::DataReader_var getter_dds_entity =
       this->context_->get_connection_info_get_dds_entity ();
-    this->getter_dds_entity_ok_ = ! ::CORBA::is_nil (this->getter_dds_entity_);
+    this->getter_dds_entity_ok_ = ! ::CORBA::is_nil (getter_dds_entity);
+    ::CCM_DDS::ContentFilterSetting_var getter_filter_config =
+      this->context_->get_connection_info_get_filter_config ();
+    this->getter_filter_config_ok_ = ! ::CORBA::is_nil (getter_filter_config);
 
     //DDS_Listen
-    this->listen_data_ =
+    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var listen_data =
       this->context_->get_connection_info_listen_data ();
-    this->listen_data_ok_ = ! ::CORBA::is_nil (this->listen_data_);
-    this->listen_data_control_ =
+    this->listen_data_ok_ = ! ::CORBA::is_nil (listen_data);
+    ::CCM_DDS::DataListenerControl_var  listen_data_control =
       this->context_->get_connection_info_listen_data_control ();
-    this->listen_data_control_ok_ = ! ::CORBA::is_nil (this->listen_data_control_);
-    this->listen_dds_entity_ =
+    this->listen_data_control_ok_ = ! ::CORBA::is_nil (listen_data_control);
+    ::DDS::DataReader_var listen_dds_entity =
       this->context_->get_connection_info_listen_dds_entity ();
-    this->listen_dds_entity_ok_ = ! ::CORBA::is_nil (this->listen_dds_entity_);
+    this->listen_dds_entity_ok_ = ! ::CORBA::is_nil (listen_dds_entity);
+    ::CCM_DDS::ContentFilterSetting_var listen_filter_config =
+      this->context_->get_connection_info_listen_filter_config ();
+    this->listen_filter_config_ok_ = ! ::CORBA::is_nil (listen_filter_config);
 
     //DDS_StateListen
-    this->statelisten_data_ =
+    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var statelisten_data =
       this->context_->get_connection_info_statelisten_data ();
-    this->statelisten_data_ok_ = ! ::CORBA::is_nil (this->statelisten_data_);
-    this->statelisten_data_control_ =
+    this->statelisten_data_ok_ = ! ::CORBA::is_nil (statelisten_data);
+    ::CCM_DDS::StateListenerControl_var statelisten_data_control =
       this->context_->get_connection_info_statelisten_data_control ();
-    this->statelisten_data_control_ok_ = ! ::CORBA::is_nil (this->statelisten_data_control_);
-    this->statelisten_dds_entity_ =
+    this->statelisten_data_control_ok_ = ! ::CORBA::is_nil (statelisten_data_control);
+    ::DDS::DataReader_var statelisten_dds_entity =
       this->context_->get_connection_info_statelisten_dds_entity ();
-    this->statelisten_dds_entity_ok_ = ! ::CORBA::is_nil (this->statelisten_dds_entity_);
+    this->statelisten_dds_entity_ok_ = ! ::CORBA::is_nil (statelisten_dds_entity);
+    ::CCM_DDS::ContentFilterSetting_var statelisten_filter_config =
+      this->context_->get_connection_info_statelisten_filter_config ();
+    this->statelisten_filter_config_ok_ = ! ::CORBA::is_nil (statelisten_filter_config);
   }
 
   void
@@ -183,6 +199,14 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
       {
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Read passed\n")));
       }
+    if (!this->reader_filter_config_ok_)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Read failed\n")));
+      }
+    else
+      {
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Read passed\n")));
+      }
     //DDS_Get
     if (!this->getter_data_ok_)
       {
@@ -209,6 +233,14 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
       {
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Get passed\n")));
       }
+    if (!this->getter_filter_config_ok_)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Get failed\n")));
+      }
+    else
+      {
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Get passed\n")));
+      }
     //DDS_Listen
     if (!this->listen_data_ok_)
       {
@@ -234,6 +266,14 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
       {
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Listen passed\n")));
       }
+    if (!this->listen_filter_config_ok_)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Listen failed\n")));
+      }
+    else
+      {
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Listen passed\n")));
+      }
     //DDS_StateListen
     if (!this->statelisten_data_ok_)
       {
@@ -259,6 +299,14 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
       {
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_StateListen passed\n")));
       }
+    if (!this->statelisten_filter_config_ok_)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_StateListen failed\n")));
+      }
+    else
+      {
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_StateListen passed\n")));
+      }
     //Provides for DDS_Read
     if (!this->reader_port_status_created_)
       {
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h
index 2dce7d28cbf..ad687cad86e 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h
@@ -67,48 +67,29 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
 
   private:
     ::State_Connection_Test::CCM_Receiver_Context_var context_;
-    //DDS_Read
-    ::State_Connection_Test::State_ConnectionTestConnector
-      ::Reader_var        reader_data_;
-    ::DDS::DataReader_var reader_dds_entity_;
-
-    //DDS_Get
-    ::State_Connection_Test::State_ConnectionTestConnector
-      ::Reader_var        getter_data_;
-    ::State_Connection_Test::State_ConnectionTestConnector
-      ::Getter_var        getter_fresh_data_;
-    ::DDS::DataReader_var getter_dds_entity_;
-
-    //DDS_Listen
-    ::State_Connection_Test::State_ConnectionTestConnector
-      ::Reader_var                      listen_data_;
-    ::CCM_DDS::DataListenerControl_var  listen_data_control_;
-    ::DDS::DataReader_var               listen_dds_entity_;
-
-    //DDS_StateListen
-    ::State_Connection_Test::State_ConnectionTestConnector
-      ::Reader_var                      statelisten_data_;
-    ::CCM_DDS::StateListenerControl_var statelisten_data_control_;
-    ::DDS::DataReader_var               statelisten_dds_entity_;
 
     //DDS_Read
     bool reader_data_ok_;
     bool reader_dds_entity_ok_;
+    bool reader_filter_config_ok_;
 
     //DDS_Get
     bool getter_data_ok_;
     bool getter_fresh_data_ok_;
     bool getter_dds_entity_ok_;
+    bool getter_filter_config_ok_;
 
     //DDS_Listen
     bool listen_data_ok_;
     bool listen_data_control_ok_;
     bool listen_dds_entity_ok_;
+    bool listen_filter_config_ok_;
 
     //DDS_StateListen
     bool statelisten_data_ok_;
     bool statelisten_data_control_ok_;
     bool statelisten_dds_entity_ok_;
+    bool statelisten_filter_config_ok_;
 
     //Provides for DDS_Read
     bool reader_port_status_created_;
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp
index 8c6eeeb618e..1130d47046b 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp
@@ -310,6 +310,25 @@
       <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
+  <connection>
+    <name>get_filter_config_port</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_get_filter_config</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>pull_observer_filter_config</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
   <!--   DDS_Get mirrorport -->
   <connection>
     <name>get_status_mirrorport</name>
@@ -370,6 +389,25 @@
       <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
+  <connection>
+    <name>read_filter_config_port</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_read_filter_config</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>passive_observer_filter_config</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
   <!--   DDS_Read mirrorport -->
   <connection>
     <name>read_status_port</name>
@@ -449,6 +487,25 @@
       <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
+  <connection>
+    <name>listen_filter_config_port</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_listen_filter_config</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>push_observer_filter_config</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
   <!--   DDS_Listen mirrorport -->
   <connection>
     <name>listen_data_listener_port</name>
@@ -547,6 +604,25 @@
       <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
+  <connection>
+    <name>statelisten_filter_config_port</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_statelisten_filter_config</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>push_state_observer_filter_config</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
   <!--   DDS_Listen mirrorport -->
   <connection>
     <name>statelisten_data_listener_port</name>
diff --git a/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl b/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl
index defa5b41dc9..5568b429ada 100755
--- a/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl
+++ b/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl
@@ -12,7 +12,7 @@ $CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
 $TAO_ROOT = "$ENV{'TAO_ROOT'}";
 $DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
 
-$TUTORIAL_BIN_ROOT = "$ENV{'CIAO_ROOT'}". "/docs/tutorials/Quoter/Simple/lib";
+$TUTORIAL_BIN_ROOT = "$ENV{'CIAO_ROOT'}". "/tutorials/Quoter/Simple/lib";
 
 $daemons_running = 0;
 $em_running = 0;