Merged RemedyWork branch.

ChangeLogTag: Thu Jan 20 11:42:53 UTC 2010  Martin Corino <mcorino@remedy.nl>

13 files changed, 187 insertions, 140 deletions

diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl
index 799284b51fd..998079340e8 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl
@@ -1,18 +1,18 @@
 // $Id$
 
 /**
- * @file I2C_Shapes_Connector.idl
+ * @file I2C_ShapeType.idl
  * @author
  */
 
-#ifndef I2C_SHAPES_CONNECTOR_IDL_
-#define I2C_SHAPES_CONNECTOR_IDL_
+#ifndef I2C_SHAPE_TYPE_IDL_
+#define I2C_SHAPE_TYPE_IDL_
 
 #include "connectors/dds4ccm/idl/dds4ccm_Entity.idl"
 
 #include "Base/I2C_Shapes_Base.idl"
 
-#pragma ciao lem "Connector/I2C_Shapes_ConnectorE.idl"
+#pragma ciao lem "Base/I2C_ShapeTypeE.idl"
 
 module I2C_Typed <typename T, sequence<T> TSeq> {
   alias DDS_Entity<T, TSeq> DDS_Typed_Entity;
@@ -22,6 +22,7 @@ module I2C_Typed <typename T, sequence<T> TSeq> {
 
 module ::I2C_Typed < ::ShapeType, ::ShapeTypeSeq> I2C_Shapes;
 
-#endif /* I2C_SHAPES_CONNECTOR_IDL_ */
+#endif /* #ifndef I2C_SHAPE_TYPE_IDL_
+ */
 
 
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
new file mode 100755
index 00000000000..abc7169aee8
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
@@ -0,0 +1,79 @@
+// $Id$
+
+project(I2C_ShapeType_idl_gen) : connectoridldefaults, ndds, ndds_stub {
+  after += DDS4CCM_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_STUB_Export \
+              -Wb,stub_export_include=I2C_ShapeType_stub_export.h \
+              -I..
+  idlflags -= -Gcn -Gxhcn
+  IDL_Files {
+    I2C_ShapeType.idl
+  }
+}
+
+project(I2C_ShapeType_lem_gen) : ciaoidldefaults, ndds_stub {
+  custom_only = 1
+  after += I2C_ShapeType_idl_gen
+  idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_LEM_STUB_Export \
+              -Wb,stub_export_include=I2C_ShapeType_lem_stub_export.h \
+              -SS -Gxhst \
+              -I ..
+
+  IDL_Files {
+    I2C_ShapeTypeE.idl
+  }
+}
+
+project(I2C_ShapeType_lem_stub) : ndds_lem_stub {
+  after += I2C_ShapeType_lem_gen I2C_ShapeType_stub I2C_Shapes_Base_stub
+  libs  += I2C_Shapes_Base_stub I2C_ShapeType_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = I2C_ShapeType_lem_stub
+  dynamicflags += I2C_SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    I2C_ShapeTypeEC.cpp
+  }
+
+  Header_Files {
+    I2C_ShapeTypeEC.h
+    I2C_ShapeType_lem_stub_export.h
+  }
+
+  Inline_Files {
+    I2C_ShapeTypeEC.inl
+  }
+}
+
+project(I2C_ShapeType_stub) : ndds_ts_default, ndds_stub {
+  after += I2C_ShapeType_idl_gen I2C_Shapes_Base_stub
+  libs  += I2C_Shapes_Base_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = I2C_ShapeType_stub
+  dynamicflags += I2C_SHAPES_CONNECTOR_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    I2C_ShapeTypeC.cpp
+  }
+
+  Header_Files {
+    I2C_ShapeTypeC.h
+    I2C_ShapeType_stub_export.h
+    I2C_Shapes_Traits.h
+  }
+
+  Inline_Files {
+    I2C_ShapeTypeC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
index 708ea1bdd0f..b2c2b0e94d6 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(I2C_Shapes_Base_stub) : taoidldefaults, dds4ccm_ts_default {
+project(I2C_Shapes_Base_stub) : taoidldefaults, ndds_ts_default {
   sharedname = I2C_Shapes_Base_stub
   dynamicflags += SHAPES_BASE_STUB_BUILD_DLL
   libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Traits.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h
index 369f1401842..626c77e6cf2 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Traits.h
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h
@@ -5,7 +5,7 @@
 #define I2C_SHAPES_TRAITS_H_
 
 #include "Base/I2C_Shapes_BaseSupport.h"
-#include "Connector/I2C_Shapes_ConnectorC.h"
+#include "Base/I2C_ShapeTypeC.h"
 
 struct ShapeType_DDS_Traits
 {
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp
index 27f03b8e9cb..3061e3eff4a 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp
@@ -9,7 +9,6 @@
 
 #define TOPIC_NAME "Square"
 
-
 I2C_Shapes_Common::I2C_Shapes_Common (void)
   : factory_ (0)
 {
@@ -27,10 +26,7 @@ I2C_Shapes_Common::I2C_Shapes_Common (void)
 
 I2C_Shapes_Common::~I2C_Shapes_Common (void)
 {
-  if (this->factory_)
-    {
-      delete this->factory_;
-    }
+  delete this->factory_;
 }
 
 int
@@ -44,10 +40,9 @@ I2C_Shapes_Common::get_domain_id (void)
 void
 I2C_Shapes_Common::initialize (void)
 {
-  ::DDS::DomainParticipantQos dp_qos;
-  this->participant_ = this->participant_factory_.create_participant (
+  this->participant_ = this->participant_factory_.create_participant_with_profile (
                                   this->get_domain_id (),
-                                  dp_qos,
+                                  QOS_PROFILE,
                                   ::DDS::DomainParticipantListener::_nil (),
                                   0);
 
@@ -80,10 +75,9 @@ I2C_Shapes_Common::initialize (void)
           "I2C_Shapes_Common::initialize - Unable to register type\n"));
       throw ::CORBA::INTERNAL ();
     }
-  ::DDS::TopicQos tqos;
-  this->topic_ = this->participant_->create_topic (TOPIC_NAME,
+  this->topic_ = this->participant_->create_topic_with_profile (TOPIC_NAME,
                                   typesupport_name,
-                                  tqos,
+                                  QOS_PROFILE,
                                   ::DDS::TopicListener::_nil (),
                                   0);
   if (::CORBA::is_nil (this->topic_.in ()))
@@ -107,9 +101,8 @@ I2C_Shapes_Common::create_publisher (void)
     {
       initialize();
     }
-  ::DDS::Publisher_var publisher;
-      ::DDS::PublisherQos pqos;
-  publisher = participant_->create_publisher (pqos,
+  ::DDS::Publisher_var publisher = participant_->create_publisher_with_profile (
+                                  QOS_PROFILE,
                                   ::DDS::PublisherListener::_nil (),
                                   0);
   return publisher._retn ();
@@ -122,9 +115,8 @@ I2C_Shapes_Common::create_subscriber (void)
     {
       initialize();
     }
-  ::DDS::Subscriber_var subscriber;
-      ::DDS::SubscriberQos sqos;
-  subscriber = participant_->create_subscriber (sqos,
+  ::DDS::Subscriber_var subscriber = participant_->create_subscriber_with_profile (
+                                  QOS_PROFILE,
                                   ::DDS::SubscriberListener::_nil (),
                                   0);
   return subscriber._retn ();
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h
index 29efe23f274..665e89e6556 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h
@@ -4,15 +4,17 @@
 #define I2C_SHAPES_COMMON_H_
 
 #include "I2C_Shapes_Common_export.h"
-#include "Connector/I2C_Shapes_Traits.h"
 #include "connectors/dds4ccm/impl/ndds/DomainParticipant.h"
 #include "connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h"
 #include "connectors/dds4ccm/impl/ndds/TypeSupport.h"
+#include "Base/I2C_Shapes_Traits.h"
 
 /**
  * Pulse generator
  */
 
+#define QOS_PROFILE "Shapes_Library#Shapes_Profile"
+
 class I2C_SHAPES_Export I2C_Shapes_Common
 {
 public:
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
index d326296f72e..2852e1beafc 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
@@ -1,11 +1,11 @@
 // $Id$
 
-project(I2C_Shapes_Common) : ndds_impl, dds4ccm_stub, dds4ccm_logger, dds4ccm_ts_default {
+project(I2C_Shapes_Common) : ndds_impl, ndds_stub, dds4ccm_logger, ndds_ts_default {
   sharedname = I2C_Shapes_Common
   dynamicflags += I2C_SHAPES_COMMON_BUILD_DLL
 
-  after += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub
-  libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub
+  after += I2C_Shapes_Base_stub I2C_ShapeType_stub
+  libs += I2C_Shapes_Base_stub I2C_ShapeType_stub
 
   libout = ../lib
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc
deleted file mode 100755
index cc80d6a0e61..00000000000
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc
+++ /dev/null
@@ -1,80 +0,0 @@
-// $Id$
-
-// project(I2C_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-project(I2C_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=I2C_Shapes_Connector_stub_export.h \
-              -I..
-  idlflags -= -Gcn -Gxhcn
-  IDL_Files {
-    I2C_Shapes_Connector.idl
-  }
-}
-
-project(I2C_Shapes_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += I2C_Shapes_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=I2C_Shapes_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    I2C_Shapes_ConnectorE.idl
-  }
-}
-
-project(I2C_Shapes_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += I2C_Shapes_Connector_lem_gen I2C_Shapes_Connector_stub I2C_Shapes_Base_stub
-  libs  += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = I2C_Shapes_Connector_lem_stub
-  dynamicflags += I2C_SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    I2C_Shapes_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    I2C_Shapes_ConnectorEC.h
-    I2C_Shapes_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    I2C_Shapes_ConnectorEC.inl
-  }
-}
-
-project(I2C_Shapes_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += I2C_Shapes_Connector_idl_gen I2C_Shapes_Base_stub
-  libs  += I2C_Shapes_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = I2C_Shapes_Connector_stub
-  dynamicflags += I2C_SHAPES_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    I2C_Shapes_ConnectorC.cpp
-  }
-
-  Header_Files {
-    I2C_Shapes_ConnectorC.h
-    I2C_Shapes_Connector_stub_export.h
-    I2C_Shapes_Traits.h
-  }
-
-  Inline_Files {
-    I2C_Shapes_ConnectorC.inl
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
index fb39c89d298..5eb637a19fd 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
@@ -5,15 +5,10 @@
 
 #include "ace/OS_NS_unistd.h"
 
-typedef ::CIAO::NDDS::DataReader_T<ShapeType_DDS_Traits::datareader_type,
-                     ShapeType_DDS_Traits::typed_reader_type,
-                     ShapeType_DDS_Traits::value_type,
-                     ShapeTypeSeq,
-                     ShapeType_DDS_Traits::dds_seq_type>
-        ShapesDataReader;
+typedef ::I2C_Shapes::DataReader TypedDataReader;
 
 void
-read (ShapesDataReader* shapes_dr)
+read (TypedDataReader::_ptr_type shapes_dr)
 {
   int samples_received = 0;
   if (shapes_dr)
@@ -23,7 +18,7 @@ read (ShapesDataReader* shapes_dr)
           //start to read
           ShapeTypeSeq data;
           ::DDS::SampleInfoSeq  info;
-          ::DDS::ReturnCode_t retcode = shapes_dr->read (
+          ::DDS::ReturnCode_t retcode = shapes_dr->take (
                                                     data,
                                                     info,
                                                     ::DDS::LENGTH_UNLIMITED,
@@ -74,15 +69,14 @@ int ACE_TMAIN (int , ACE_TCHAR *[])
         }
 
       ::DDS::Topic_var topic = common.get_topic ();
-      ::DDS::DataReader_var dr;
-      ::DDS::DataReaderQos dqos;
-      dr = subscriber->create_datareader (topic.in (),
-                                      dqos,
+      ::DDS::DataReader_var dr = subscriber->create_datareader_with_profile (
+                                      topic.in (),
+                                      QOS_PROFILE,
                                       ::DDS::DataReaderListener::_nil (),
                                       0);
 
-      ShapesDataReader * shapes_dr = dynamic_cast <ShapesDataReader *>(dr.in ());
-      read (shapes_dr);
+      TypedDataReader::_var_type shapes_dr = TypedDataReader::_narrow (dr.in ());
+      read (shapes_dr.in ());
     }
   catch (::CORBA::Exception &e)
     {
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
index 8e4b2a14897..e34f940b46a 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
@@ -1,12 +1,12 @@
 // $Id$
 
-project(*i2c_shapes_receiver) : ndds_impl, dds4ccm_stub, dds4ccm_ts_default {
+project(*i2c_shapes_rec) : ndds_impl, ndds_stub, ndds_ts_default {
   exename = I2C_Shapes_Receiver
-  after += I2C_Shapes_Base_Stub I2C_Shapes_Connector_stub I2C_Shapes_Common
+  after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common
 
   includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors
 
-  libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub I2C_Shapes_Common
+  libs += I2C_Shapes_Base_stub I2C_ShapeType_stub I2C_Shapes_Common
   libpaths += ../lib
 
   exeout += ../lib
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp
index ececa972aa3..d849a80f1bb 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp
@@ -7,13 +7,10 @@
 
 #define MAX_X_Y 250
 
-typedef ::CIAO::NDDS::DataWriter_T<ShapeType_DDS_Traits::datawriter_type,
-                     ShapeType_DDS_Traits::typed_writer_type,
-                     ShapeType_DDS_Traits::value_type>
-        ShapesDataWriter;
+typedef ::I2C_Shapes::DataWriter TypedDataWriter;
 
 void
-write (ShapesDataWriter * shapes_dw)
+write (TypedDataWriter::_ptr_type shapes_dw)
 {
   if (shapes_dw)
     {
@@ -70,8 +67,7 @@ int ACE_TMAIN (int , ACE_TCHAR *[])
   I2C_Shapes_Common common;
   try
     {
-      ::DDS::Publisher_var publisher;
-      publisher = common.create_publisher ();
+      ::DDS::Publisher_var publisher = common.create_publisher ();
       if (::CORBA::is_nil (publisher.in ()))
         {
           ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Publisher seems to be nil\n"));
@@ -79,14 +75,13 @@ int ACE_TMAIN (int , ACE_TCHAR *[])
         }
 
       ::DDS::Topic_var topic = common.get_topic ();
-      ::DDS::DataWriter_var dw;
-      ::DDS::DataWriterQos wqos;
-      dw = publisher->create_datawriter (topic.in (),
-                                      wqos,
+      ::DDS::DataWriter_var dw = publisher->create_datawriter_with_profile (
+                                      topic.in (),
+                                      QOS_PROFILE,
                                       ::DDS::DataWriterListener::_nil (),
                                       0);
 
-      ShapesDataWriter * shapes_dw = dynamic_cast <ShapesDataWriter *>(dw.in ());
+      TypedDataWriter::_var_type shapes_dw = TypedDataWriter::_narrow (dw.in ());
       write (shapes_dw);
     }
   catch (::CORBA::Exception &e)
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
index 74935878905..6df7f441f7d 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
@@ -1,13 +1,13 @@
 // $Id$
 
-project(*i2c_shapes_sender) : ndds_impl, dds4ccm_stub, dds4ccm_ts_default {
+project(*i2c_shapes_sender) : ndds_impl, ndds_stub, ndds_ts_default {
   exename = I2C_Shapes_Sender
-  after += I2C_Shapes_Base_Stub I2C_Shapes_Connector_stub I2C_Shapes_Common
+  after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common
 
   includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors
 
   exeout += ../lib
-  libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub I2C_Shapes_Common
+  libs += I2C_Shapes_Base_stub I2C_ShapeType_stub I2C_Shapes_Common
   libpaths += ../lib
 
   Source_Files {
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml
new file mode 100644
index 00000000000..88a80a396e4
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Description
+XML QoS Profile
+
+The QoS configuration of the DDS entities in the generated example is
+loaded from this file.
+
+This file is used only when it is in the current working directory
+or when the enviroment variable
+NDDS_QOS_PROFILES is defined and points to this file.
+
+For more information about XML QoS Profiles see Chapter 15 in the
+RTI Data Distribution Service user manual.
+-->
+<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d">
+  <!-- QoS Library containing the QoS profile used in the generated example.
+
+        A QoS library is a named set of QoS profiles.
+    -->
+  <qos_library name="Shapes_Library">
+    <!-- QoS profile used to configure reliable communication between the DataWriter
+             and DataReader created in the example code.
+
+             A QoS profile groups a set of related QoS.
+        -->
+    <qos_profile name="Shapes_Profile" is_default_qos="true">
+      <!-- QoS used to configure the data writer created in the example code -->
+      <datawriter_qos>
+        <reliability>
+          <kind>RELIABLE_RELIABILITY_QOS</kind>
+          <max_blocking_time>
+            <sec>10</sec>
+            <nanosec>0</nanosec>
+          </max_blocking_time>
+        </reliability>
+        <durability>
+          <kind>TRANSIENT_DURABILITY_QOS</kind>
+        </durability>
+        <history>
+          <kind>KEEP_ALL_HISTORY_QOS</kind>
+        </history>
+        <protocol>
+          <rtps_reliable_writer>
+            <max_heartbeat_retries>10</max_heartbeat_retries>
+          </rtps_reliable_writer>
+        </protocol>
+      </datawriter_qos>
+      <!-- QoS used to configure the data reader created in the example code -->
+      <datareader_qos>
+        <reliability>
+          <kind>RELIABLE_RELIABILITY_QOS</kind>
+        </reliability>
+        <history>
+          <kind>KEEP_ALL_HISTORY_QOS</kind>
+        </history>
+        <durability>
+          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
+        </durability>
+      </datareader_qos>
+    </qos_profile>
+  </qos_library>
+</dds>