Thu Nov 26 08:09:39 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
          Optimized logging for ConnectorStatusListener.

        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc:
        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc:
          Resolved fuzz warning (project names too long).

4 files changed, 61 insertions, 53 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index dcf5c1a09bc..6920b178f43 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Nov 26 08:09:39 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
+          Optimized logging for ConnectorStatusListener.
+
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc:
+          Resolved fuzz warning (project names too long).
+
 Thu Nov 26 07:32:26 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl:
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
index 04ed75d1686..3355cbaa924 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
@@ -115,52 +115,51 @@ namespace CIAO_Hello_Receiver_Impl
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
   void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/)
+     ::DDS::Topic_ptr /* the_topic */,
+     const DDS::InconsistentTopicStatus & /* status */)
   {
-    printf("ConnectorStatusListener_exec_i::on_inconsistent_topic\n");
+    CIAO_ERROR ((LM_DEBUG, ACE_TEXT ("Receiver: ")
+          ACE_TEXT ("ConnectorStatusListener_exec_i::on_inconsistent_topic\n")));
   }
 
   void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::RequestedIncompatibleQosStatus & /*status*/)
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  
   {
-    printf("ConnectorStatusListener_exec_i::on_requested_incompatible_qos\n");
+    CIAO_ERROR ((LM_DEBUG, ACE_TEXT ("Receiver: ")
+          ACE_TEXT ("ConnectorStatusListener_exec_i::on_requested_incompatible_qos\n")));
   }
 
   void ConnectorStatusListener_exec_i::on_sample_rejected(
      ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::SampleRejectedStatus & /*status*/)
+     const DDS::SampleRejectedStatus & /*status*/)  
   {
-    printf("ConnectorStatusListener_exec_i::on_sample_rejected\n");
+    CIAO_ERROR ((LM_DEBUG, ACE_TEXT ("Receiver: ")
+          ACE_TEXT ("ConnectorStatusListener_exec_i::on_sample_rejected\n")));
   }
 
   void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
      ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedDeadlineMissedStatus & /*status*/)
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  
   {
-    printf("ConnectorStatusListener_exec_i::on_offered_deadline_missed\n");
+    CIAO_ERROR ((LM_DEBUG, ACE_TEXT ("Receiver: ")
+          ACE_TEXT ("ConnectorStatusListener_exec_i::on_offered_deadline_missed\n")));
   }
 
   void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
      ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedIncompatibleQosStatus & /*status*/)
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  
   {
-    printf("ConnectorStatusListener_exec_i::on_offered_incompatible_qos\n");
+    CIAO_ERROR ((LM_DEBUG, ACE_TEXT ("Receiver: ")
+          ACE_TEXT ("ConnectorStatusListener_exec_i::on_offered_incompatible_qos\n")));
   }
 
   void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
+    ::DDS::StatusKind  /*status_kind*/)  
   {
-    printf("ConnectorStatusListener_exec_i::on_unexpected_status\n");
-  }
-
-  void ConnectorStatusListener_exec_i::on_subscription_matched (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const ::DDS::SubscriptionMatchedStatus & /*status*/)
-  {
-    printf ("##$@##$@#$@#$@#$@#$@#$@#$\n");
+    CIAO_ERROR ((LM_DEBUG, ACE_TEXT ("Receiver: ")
+          ACE_TEXT ("ConnectorStatusListener_exec_i::on_unexpected_status\n")));
   }
 
 
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
index 7bcfab5bb5d..f3ecdc7f56c 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n SetConnectorAttribute_Base"
 
-project(DDS_SetConnectorAttributeBase_idl_gen) : taoidldefaults, anytypecode {
+project(DDS_SCABase_idl_gen) : taoidldefaults, anytypecode {
   custom_only = 1
   idlflags -= -St -Sa
   idlflags += -SS -Gxhst \
@@ -13,9 +13,9 @@ project(DDS_SetConnectorAttributeBase_idl_gen) : taoidldefaults, anytypecode {
   }
 }
 
-project(DDS_SetConnectorAttributeBase_ndds_ts_gen) : ndds_ts_defaults   {
+project(DDS_SCABase_ndds_ts_gen) : ndds_ts_defaults   {
   custom_only = 1
-  after += DDS_SetConnectorAttributeBase_idl_gen
+  after += DDS_SCABase_idl_gen
   ndds_ts_flags += -corba SetConnectorAttribute_BaseC.h -orb ACE_TAO1.7
 
   NDDSTypeSupport_Files {
@@ -23,12 +23,12 @@ project(DDS_SetConnectorAttributeBase_ndds_ts_gen) : ndds_ts_defaults   {
   }
 }
 
-project(DDS_SetConnectorAttributeBase_NDDS_TS) : nddslib, taolib {
-  after += DDS_SetConnectorAttributeBase_ndds_ts_gen DDS_SetConnectorAttributeBase_stub
-  libs += DDS_SetConnectorAttributeBase_stub
+project(DDS_SCABase_NDDS_TS) : nddslib, taolib {
+  after += DDS_SCABase_ndds_ts_gen DDS_SCABase_stub
+  libs += DDS_SCABase_stub
   libout = ../lib
   libpaths    += ../lib
-  sharedname = DDS_SetConnectorAttributeBase_NDDS_TS
+  sharedname = DDS_SCABase_NDDS_TS
   dynamicflags = NDDS_USER_DLL_EXPORT
 
   verbatim(gnuace, macros) {
@@ -51,11 +51,11 @@ project(DDS_SetConnectorAttributeBase_NDDS_TS) : nddslib, taolib {
   }
 }
 
-project(DDS_SetConnectorAttributeBase_stub) : ccm_stub {
-  after += DDS_SetConnectorAttributeBase_idl_gen
+project(DDS_SCABase_stub) : ccm_stub {
+  after += DDS_SCABase_idl_gen
   libout = ../lib
   libpaths += ../lib
-  sharedname = DDS_SetConnectorAttributeBase_stub
+  sharedname = DDS_SCABase_stub
   dynamicflags = SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
index 9685f8ffd1a..4d7f1e1c1c4 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_SetConnectorAttributeBase -l .. -o ../lib -u DDS SetConnectorAttribute_Connector"
+// This file is generated with "generate_component_mpc.pl -p DDS_SCABase -l .. -o ../lib -u DDS SetConnectorAttribute_Connector"
 
-project(DDS_SetConnectorAttributeConnector_idl_gen) : connectoridldefaults {
+project(DDS_SCAConnector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_STUB_Export \
@@ -19,9 +19,9 @@ project(DDS_SetConnectorAttributeConnector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_SetConnectorAttributeConnector_lem_gen) : ciaoidldefaults {
+project(DDS_SCAConnector_lem_gen) : ciaoidldefaults {
   custom_only = 1
-  after += DDS_SetConnectorAttributeConnector_idl_gen
+  after += DDS_SCAConnector_idl_gen
   idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=SetConnectorAttribute_Connector_lem_stub_export.h \
               -SS -Gxhst \
@@ -32,13 +32,13 @@ project(DDS_SetConnectorAttributeConnector_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_SetConnectorAttributeConnector_lem_stub) : ccm_svnt, dds4ccm_base   {
-  after += DDS_SetConnectorAttributeConnector_lem_gen DDS_SetConnectorAttributeConnector_stub DDS_SetConnectorAttributeBase_stub DDS4CCM_lem_stub
-  libs  += DDS_SetConnectorAttributeBase_stub DDS_SetConnectorAttributeConnector_stub DDS4CCM_lem_stub
+project(DDS_SCAConnector_lem_stub) : ccm_svnt, dds4ccm_base   {
+  after += DDS_SCAConnector_lem_gen DDS_SCAConnector_stub DDS_SCABase_stub DDS4CCM_lem_stub
+  libs  += DDS_SCABase_stub DDS_SCAConnector_stub DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  sharedname = DDS_SetConnectorAttributeConnector_lem_stub
+  sharedname = DDS_SCAConnector_lem_stub
   dynamicflags   = SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_BUILD_DLL
 
   IDL_Files {
@@ -58,13 +58,13 @@ project(DDS_SetConnectorAttributeConnector_lem_stub) : ccm_svnt, dds4ccm_base
   }
 }
 
-project(DDS_SetConnectorAttributeConnector_stub) : ccm_stub, dds4ccm_base   {
-  after += DDS_SetConnectorAttributeConnector_idl_gen DDS_SetConnectorAttributeBase_stub
-  libs  += DDS_SetConnectorAttributeBase_stub
+project(DDS_SCAConnector_stub) : ccm_stub, dds4ccm_base   {
+  after += DDS_SCAConnector_idl_gen DDS_SCABase_stub
+  libs  += DDS_SCABase_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  sharedname = DDS_SetConnectorAttributeConnector_stub
+  sharedname = DDS_SCAConnector_stub
   dynamicflags   = SETCONNECTORATTRIBUTE_CONNECTOR_STUB_BUILD_DLL
 
   IDL_Files {
@@ -84,10 +84,10 @@ project(DDS_SetConnectorAttributeConnector_stub) : ccm_stub, dds4ccm_base   {
   }
 }
 
-project(DDS_SetConnectorAttributeConnector_exec) : ciao_executor, dds4ccm_skel, nddslib {
-  after   += DDS_SetConnectorAttributeConnector_lem_stub DDS_SetConnectorAttributeConnector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_SetConnectorAttributeBase_NDDS_TS
-  sharedname = DDS_SetConnectorAttributeConnector_exec
-  libs += DDS_SetConnectorAttributeConnector_stub DDS_SetConnectorAttributeConnector_lem_stub DDS_SetConnectorAttributeBase_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_SetConnectorAttributeBase_NDDS_TS
+project(DDS_SCAConnector_exec) : ciao_executor, dds4ccm_skel, nddslib {
+  after   += DDS_SCAConnector_lem_stub DDS_SCAConnector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_SCABase_NDDS_TS
+  sharedname = DDS_SCAConnector_exec
+  libs += DDS_SCAConnector_stub DDS_SCAConnector_lem_stub DDS_SCABase_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_SCABase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,13 +110,13 @@ project(DDS_SetConnectorAttributeConnector_exec) : ciao_executor, dds4ccm_skel,
 }
 
 
-project(DDS_SetConnectorAttributeConnector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
-  after      += DDS_SetConnectorAttributeConnector_lem_stub DDS_SetConnectorAttributeConnector_exec DDS_SetConnectorAttributeConnector_stub DDS4CCM_lem_stub
-  sharedname  = DDS_SetConnectorAttributeConnector_svnt
-  libs       += DDS_SetConnectorAttributeConnector_stub \
-                DDS_SetConnectorAttributeConnector_lem_stub  \
-                DDS_SetConnectorAttributeBase_stub \
-                DDS_SetConnectorAttributeConnector_exec \
+project(DDS_SCAConnector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
+  after      += DDS_SCAConnector_lem_stub DDS_SCAConnector_exec DDS_SCAConnector_stub DDS4CCM_lem_stub
+  sharedname  = DDS_SCAConnector_svnt
+  libs       += DDS_SCAConnector_stub \
+                DDS_SCAConnector_lem_stub  \
+                DDS_SCABase_stub \
+                DDS_SCAConnector_exec \
                 DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib