Tue Jun 8 13:44:55 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/impl/dds/ContentFilterSetting.h:
        * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp:
        * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h:
        * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp:
        * connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc:
          Implemented DDS4LwCCM Beta 3 spec regarding contentfilteredTopics.
          This could not be fully tested since passing structs from the deployment
          plans to the connector didn't work yet. So all accompanying tests will
          fail for now.

        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/*:
          Added contentfilteredTopics for listeners on the Event connector.

        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/*:
          Added test for the reader and getter extended ports,
          having a different query.

        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/*:
          Added contentfilteredTopics for listeners on the State connector.

        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc:
        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc:
        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc:
        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc:
        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc:
          Renamed projects in order to prevent duplicate project names.

1 files changed, 11 insertions, 11 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
index 9cbaf440193..3c374fb02fa 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(QC_ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += ReadGet_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(ReadGet_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(QC_ReadGet_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += ReadGet_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -29,10 +29,10 @@ project(ReadGet_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(ReadGet_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
+project(QC_ReadGet_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += ReadGet_Test_Receiver_lem_gen ReadGet_Test_Receiver_stub  \
            ReadGet_Test_Connector_stub ReadGet_Test_Base_stub \
-           DDS_ReadGet_Starter_stub
+           QC_ReadGet_Starter_stub
   libs  +=  Receiver_stub ReadGet_Test_Connector_stub \
             ReadGet_Test_Base_stub ReadGet_Starter_stub
   libpaths += ../lib
@@ -58,10 +58,10 @@ project(ReadGet_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   }
 }
 
-project(ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
+project(QC_ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
   after += ReadGet_Test_Receiver_idl_gen  ReadGet_Test_Connector_stub \
            ReadGet_Test_Base_stub ReadGet_Test_Connector_lem_gen \
-           DDS_ReadGet_Starter_stub DDS_ReadGet_Starter_lem_stub
+           QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub
   libs  += ReadGet_Test_Connector_stub ReadGet_Test_Base_stub \
            ReadGet_Starter_stub
   libpaths += ../lib
@@ -87,11 +87,11 @@ project(ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
+project(QC_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
   after   += ReadGet_Test_Receiver_lem_stub ReadGet_Test_Receiver_stub \
              ReadGet_Test_Base_stub ReadGet_Test_Connector_stub \
              ReadGet_Test_Connector_lem_stub DDS4CCM_lem_stub \
-             DDS_ReadGet_Starter_lem_stub DDS_ReadGet_Starter_stub
+             QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub
   sharedname = Receiver_exec
   libs += Receiver_stub Receiver_lem_stub ReadGet_Test_Base_stub \
           ReadGet_Test_Connector_stub ReadGet_Test_Connector_lem_stub \
@@ -118,12 +118,12 @@ project(ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(QC_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   ReadGet_Test_Receiver_lem_stub ReadGet_Test_Base_stub \
                   ReadGet_Test_Connector_stub ReadGet_Test_Connector_svnt \
                   ReadGet_Test_Receiver_exec ReadGet_Test_Connector_lem_stub \
-                  DDS4CCM_lem_stub DDS4CCM_skel DDS_ReadGet_Starter_stub \
-                  DDS_ReadGet_Starter_svnt DDS_ReadGet_Starter_lem_stub
+                  DDS4CCM_lem_stub DDS4CCM_skel QC_ReadGet_Starter_stub \
+                  QC_ReadGet_Starter_svnt QC_ReadGet_Starter_lem_stub
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub ReadGet_Test_Base_stub \
                 ReadGet_Test_Connector_stub ReadGet_Test_Connector_svnt \