Wed Jun 16 12:51:22 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl:
          Created a _defn.idl file for definition like return values.

12 files changed, 108 insertions, 41 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 78a12d089df..52e1bfa62d6 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Wed Jun 16 12:51:22 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl:
+          Created a _defn.idl file for definition like return values.
+
 Wed Jun 16 12:46:56 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc
index f3515f4458e..ec4a8c47611 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc
@@ -9,7 +9,7 @@ project(ShapesControl_obj_idl_gen) : componentidldefaults {
               -Wb,svnt_export_macro=SHAPES_CONTROL_SVNT_Export \
               -Wb,svnt_export_include=ShapesControl_obj_svnt_export.h \
               -Wb,exec_export_macro=SHAPES_CONTROL_EXEC_Export \
-              -Wb,exec_export_include=ShapesControl_exec_export.h \
+              -Wb,exec_export_include=ShapesControl_obj_exec_export.h \
               -I ../ports \
               -I ports \
               -o GeneratedCode
@@ -63,8 +63,8 @@ project(ShapesControl_obj_lem_stub) : ccm_svnt {
 }
 
 project(ShapesControl_obj_stub) : ccm_stub {
-  after += ShapesControl_obj_idl_gen
-  libs  +=
+  after += ShapesControl_obj_idl_gen Shapes_defn_idl_gen Shapes_defn_stub
+  libs  += Shapes_defn_stub
   libpaths += ../lib
   libout = ../lib
   includes += ../ports/GeneratedCode
@@ -90,9 +90,11 @@ project(ShapesControl_obj_stub) : ccm_stub {
 
 
 project(ShapesControl_obj_svnt) : ciao_servant {
-  after      += ShapesControl_obj_lem_stub ShapesControl_obj_stub
+  after      += ShapesControl_obj_lem_stub ShapesControl_obj_stub \
+                Shapes_defn_idl_gen Shapes_defn_stub
   sharedname  = ShapesControl_obj_svnt
-  libs       += ShapesControl_obj_stub ShapesControl_obj_lem_stub
+  libs       += ShapesControl_obj_stub ShapesControl_obj_lem_stub \
+                Shapes_defn_stub
   libpaths += ../lib
   libout = ../lib
   includes += ../ports/GeneratedCode
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl
index a3bf9359337..70666866e15 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl
@@ -1,31 +1,19 @@
+// $Id$
 
 #ifndef SHAPES_CONTROL_IDL_
 #define SHAPES_CONTROL_IDL_
 
-// #include "Shapes_defn.idl"
+#include "Shapes_defn.idl"
 
 #pragma ciao lem "ShapesControl_objE.idl"
 
 module Shapes
 {
-  enum COLOR
-  {
-    WHITE,
-    RED,
-    YELLOW,
-    GREEN
-  };
-
   interface Control_obj
   {
-    boolean setSize (in unsigned short size);
-    boolean setLocation (in unsigned short x,
-                         in unsigned short y);
-/*
-      ReturnStatus changeColor (in COLOR shape_color);
-      ReturnStatus changeMaxSize (in short max_size);
-      ReturnStatus changeMinSize (in short min_size);
-*/
+    ReturnStatus setSize (in unsigned short size);
+    ReturnStatus setLocation (in unsigned short x,
+                              in unsigned short y);
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp
index f6566a31c14..f5860d3fe76 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp
@@ -23,7 +23,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl
   // Operations from ::CCM_DDS::ShapeType_Listener
   void
   ShapeType_Listener_exec_i::on_many_data (
-    const ShapeTypeSeq & /* an_instance */,
+    const ::Shapes::ShapeTypeSeq & /* an_instance */,
     const ::CCM_DDS::ReadInfoSeq & /* info */)
   {
   }
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h
index 3ef87d84ebb..e132abbe3b4 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h
@@ -34,7 +34,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl
       const ::CCM_DDS::ReadInfo & info);
     virtual void
     on_many_data (
-      const ShapeTypeSeq & an_instance,
+      const ::Shapes::ShapeTypeSeq & an_instance,
       const ::CCM_DDS::ReadInfoSeq & info);
   };
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc
index b0e3276b1a4..36361f2866d 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc
@@ -97,11 +97,12 @@ project(ShapesSender_stub) : ccm_stub, dds4ccm_base {
 
 project(ShapesSender_exec) : ciao_executor, dds4ccm_base {
   after   += ShapesSender_lem_stub ShapesSender_stub Shapes_conn_lem_stub \
-             Shapes_conn_stub ShapesControl_lem_stub ShapesControl_obj_lem_stub
+             Shapes_conn_stub ShapesControl_lem_stub ShapesControl_obj_lem_stub \
+             Shapes_defn_stub ShapesControl_obj_stub
   sharedname = ShapesSender_exec
   libs += ShapesSender_stub ShapesSender_lem_stub Shapes_msg_stub \
           Shapes_conn_lem_stub Shapes_conn_stub ShapesControl_lem_stub \
-          ShapesControl_obj_lem_stub
+          ShapesControl_obj_lem_stub Shapes_defn_stub ShapesControl_obj_stub
   libpaths += ../lib
   includes +=  ./GeneratedCode \
                ../ports/GeneratedCode \
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp
index 15df0344985..e451a61422e 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp
@@ -20,13 +20,13 @@ namespace CIAO_Shapes_Sender_comp_Impl
   {
   }
 
-  ::CORBA::Boolean
+  ::Shapes::ReturnStatus
   Controller_exec_i::setSize (::CORBA::UShort size)
   {
     return this->callback_.setSize (size);
   }
 
-  ::CORBA::Boolean
+  ::Shapes::ReturnStatus
   Controller_exec_i::setLocation (::CORBA::UShort x,
                                   ::CORBA::UShort y)
   {
@@ -57,14 +57,14 @@ namespace CIAO_Shapes_Sender_comp_Impl
     return new Controller_exec_i (*this);
   }
 
-  bool
+  ::Shapes::ReturnStatus
   Sender_exec_i::setSize (::CORBA::UShort size)
   {
     this->square_.shapesize = size;
     return this->update_square ();
   }
 
-  bool
+  ::Shapes::ReturnStatus
   Sender_exec_i::setLocation (::CORBA::UShort x,
                               ::CORBA::UShort y)
   {
@@ -73,7 +73,7 @@ namespace CIAO_Shapes_Sender_comp_Impl
     return this->update_square ();
   }
 
-  bool
+  ::Shapes::ReturnStatus
   Sender_exec_i::update_square ()
   {
     ::Shapes::ShapesConnector::Writer_var writer =
@@ -82,7 +82,7 @@ namespace CIAO_Shapes_Sender_comp_Impl
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ")
                               ACE_TEXT ("Unable to write: write_data is nil.\n")));
-        return false;
+        return ::Shapes::RETURN_ERROR;
       }
 
     try
@@ -106,7 +106,7 @@ namespace CIAO_Shapes_Sender_comp_Impl
                     ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"),
                     this->square_.color.in ()));
       }
-    return  true;
+    return ::Shapes::RETURN_OK;
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h
index d1363a3e259..02c2ce1157e 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h
@@ -31,10 +31,10 @@ namespace CIAO_Shapes_Sender_comp_Impl
     Controller_exec_i (Sender_exec_i &callback);
     virtual ~Controller_exec_i (void);
 
-    virtual ::CORBA::Boolean
+    virtual ::Shapes::ReturnStatus 
     setSize (::CORBA::UShort size);
 
-    virtual ::CORBA::Boolean
+    virtual ::Shapes::ReturnStatus 
     setLocation (::CORBA::UShort x, ::CORBA::UShort y);
 
   private:
@@ -63,19 +63,20 @@ namespace CIAO_Shapes_Sender_comp_Impl
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
 
-    bool
+    ::Shapes::ReturnStatus
     setSize (::CORBA::UShort size);
 
-    bool
+    ::Shapes::ReturnStatus
     setLocation (::CORBA::UShort x, ::CORBA::UShort y);
 
-    bool
-    update_square (void);
   private:
     ::Shapes::CCM_Sender_comp_Context_var context_;
     ::DDS::InstanceHandle_t instance_handle_;
 
     ShapeType square_;
+
+    ::Shapes::ReturnStatus
+    update_square (void);
   };
 
   extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.idl
index 4f79dd6e9c1..f200895acc3 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.idl
@@ -11,7 +11,8 @@
 
 module Shapes
 {
-  module ::CCM_DDS::Typed < ::ShapeType, ::ShapeTypeSeq> ShapesConnector;
+  typedef sequence<ShapeType> ShapeTypeSeq;
+  module ::CCM_DDS::Typed < ::ShapeType, ShapeTypeSeq> ShapesConnector;
 };
 
 #endif /* SHAPES_CONN_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl
new file mode 100644
index 00000000000..bb47b8153b6
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl
@@ -0,0 +1,23 @@
+//$Id$
+
+#ifndef SHAPES_DEFN_IDL_
+#define SHAPES_DEFN_IDL_
+
+module Shapes
+{
+  enum COLOR
+  {
+    WHITE,
+    RED,
+    YELLOW,
+    GREEN
+  };
+
+  enum ReturnStatus
+  {
+    RETURN_OK,
+    RETURN_ERROR
+  };
+};
+
+#endif /* SHAPES_DEFN_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc
new file mode 100644
index 00000000000..3edfa9faca1
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc
@@ -0,0 +1,37 @@
+// $Id$
+
+project(Shapes_defn_idl_gen) : taoidldefaults {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \
+              -Wb,stub_export_include=Shapes_defn_stub_export.h \
+              -SS -Gxhst \
+              -o GeneratedCode
+
+  IDL_Files {
+    Shapes_defn.idl
+    gendir = GeneratedCode
+  }
+}
+
+
+project(Shapes_defn_stub) : ccm_stub {
+  after += Shapes_defn_idl_gen
+  libpaths += ../lib
+  libout = ../lib
+  includes += ./GeneratedCode
+  sharedname = Shapes_defn_stub
+  dynamicflags = SHAPES_CONTROL_STUB_BUILD_DLL
+
+  Source_Files {
+    GeneratedCode/Shapes_defnC.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_defnC.h
+    GeneratedCode/Shapes_defn_stub_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_defnC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl
index 620cd1a9b87..ba81ce127f0 100755
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl
@@ -28,7 +28,6 @@ struct Attributes {
   string color; //@key
   float speed;
 };
-typedef sequence<ShapeType> ShapeTypeSeq;
 
 #pragma keylist Attributes shape color