Fri Feb 19 08:35:57 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.cpp
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp
        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp
        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp
        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp
        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp
        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp
        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp
        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp
        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp
        * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.cpp
        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.cpp
        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp
        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp
        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp
        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.cpp
        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.cpp
        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.cpp
        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h
        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h
        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h
        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h
        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h
        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h
        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h
        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h
        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h
        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h
        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h
        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h
        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h
        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h
        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h
        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h
        * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h
        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h
        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h
        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h
        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h
        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h
        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h
        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h
          Removed from the archive, generated by tao_idl from now

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl
        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
        * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl
        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
          Added RTI typesupport pragma

        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
        * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
          Updated to let tao_idl generate the connector

4 files changed, 8 insertions, 96 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
index 2c9c7a55b43..b9450a17bb0 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
@@ -8,6 +8,8 @@
 #ifndef KEYED_TEST_BASE_IDL
 #define KEYED_TEST_BASE_IDL
 
+#pragma rti typesupport "Base/Keyed_Test_BaseSupport.h"
+
 struct KeyedTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
index bdcda9f692d..a130930e482 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
@@ -10,8 +10,8 @@ project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults {
               -Wb,skel_export_include=Keyed_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=KEYED_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Keyed_Test_Connector_svnt_export.h \
-              -Wb,exec_export_macro=KEYED_TEST_CONNECTOR_EXEC_Export \
-              -Wb,exec_export_include=Keyed_Test_Connector_exec_export.h \
+              -Wb,conn_export_macro=KEYED_TEST_CONNECTOR_CONN_Export \
+              -Wb,conn_export_include=Keyed_Test_Connector_conn_export.h \
               -I ..
 
   IDL_Files {
@@ -91,18 +91,18 @@ project(DDS_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = KEYED_TEST_CONNECTOR_EXEC_BUILD_DLL
+  dynamicflags   = KEYED_TEST_CONNECTOR_CONN_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Keyed_Test_Connector_exec.cpp
+    Keyed_Test_Connector_conn.cpp
   }
 
   Header_Files {
-    Keyed_Test_Connector_exec.h
-    Keyed_Test_Connector_exec_export.h
+    Keyed_Test_Connector_conn.h
+    Keyed_Test_Connector_conn_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp
deleted file mode 100644
index 052eacaeced..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Keyed_Test_Connector_exec.h"
-
-namespace CIAO_Keyed_Test_Keyed_Test_Connector_Impl
-{
-  Keyed_Test_Connector_exec_i::Keyed_Test_Connector_exec_i (void)
-    : DDS_Event_Connector_T<KeyedTest_DDS_Traits, KeyedTest_Connector_Traits> ()
-  {
-  }
-
-  Keyed_Test_Connector_exec_i::~Keyed_Test_Connector_exec_i (void)
-  {
-  }
-
-  extern "C" KEYED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Keyed_Test_Keyed_Test_Connector_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Keyed_Test_Connector_exec_i ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
deleted file mode 100644
index c9b40f57f77..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef KEYED_TEST_CONNECTOR_EXEC_H_
-#define KEYED_TEST_CONNECTOR_EXEC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Keyed_Test_ConnectorEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Keyed_Test_Connector_exec_export.h"
-
-#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
-#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
-
-#include "Base/Keyed_Test_BaseSupport.h"
-
-namespace CIAO_Keyed_Test_Keyed_Test_Connector_Impl
-{
-
-  // @from use of KeyedTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits <
-    KeyedTest,
-    KeyedTestSeq,
-    KeyedTestTypeSupport,
-    KeyedTestDataWriter,
-    KeyedTestDataReader > KeyedTest_DDS_Traits;
-
-  typedef CIAO::DDS4CCM::Connector_Traits <
-    ::CIAO_Keyed_Test_Keyed_Test_Connector_Impl::Keyed_Test_Connector_Exec,
-    KeyedTest_Seq,
-    ::CCM_DDS::KeyedTest::CCM_Writer,
-    ::CCM_DDS::KeyedTest::CCM_Updater,
-    ::CCM_DDS::KeyedTest::CCM_Getter,
-    ::CCM_DDS::KeyedTest::CCM_Reader,
-    ::Keyed_Test::CCM_Keyed_Test_Connector_Context,
-    ::CCM_DDS::KeyedTest::Listener,
-    ::CCM_DDS::KeyedTest::StateListener,
-    ::CCM_DDS::ConnectorStatusListener> KeyedTest_Connector_Traits;
-
-  class KEYED_TEST_CONNECTOR_EXEC_Export Keyed_Test_Connector_exec_i :
-    public DDS_Event_Connector_T <KeyedTest_DDS_Traits, KeyedTest_Connector_Traits>
-  {
-  public:
-    Keyed_Test_Connector_exec_i (void);
-    virtual ~Keyed_Test_Connector_exec_i (void);
-  };
-
-  extern "C" KEYED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Keyed_Test_Keyed_Test_Connector_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-