Mon Mar 4 12:55:09 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl:
        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl:
        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h:
        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h:
        * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp:
          Moved the ShapeType into a nested module and update the cdp
          to set a fixed typename. Matches the 2013 version of the
          shapes example

6 files changed, 81 insertions, 20 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index cdc6b69198f..fc400ecd880 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Mon Mar  4 12:55:09 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl:
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h:
+        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h:
+        * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp:
+          Moved the ShapeType into a nested module and update the cdp
+          to set a fixed typename. Matches the 2013 version of the
+          shapes example
+
 Wed Feb 27 08:17:40 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/idl/dds4ccm_Connector.idl:
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
index 9b22f8e2374..199112c9b89 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
@@ -11,30 +11,46 @@
 #pragma ndds typesupport "Base/Shapes_BaseSupport.h"
 #pragma opendds typesupport "Base/Shapes_BaseTypeSupportImpl.h"
 
-#pragma DCPS_DATA_TYPE "ShapeType"
-#pragma DCPS_DATA_KEY "ShapeType color"
-
-struct ShapeType {
-  string color; //@key
-  long x;
-  long y;
-  long shapesize;
-};
-
+#pragma DCPS_DATA_TYPE "org::omg::dds::demo::ShapeType"
+#pragma DCPS_DATA_KEY "org::omg::dds::demo::ShapeType color"
+
+module org {
+  module omg {
+    module dds {
+      module demo {
+        struct ShapeType {
+          string color; //@key
+          long x;
+          long y;
+          long shapesize;
+        };
 #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ShapeType> ShapeTypeSeq;
+        typedef sequence<ShapeType> ShapeTypeSeq;
 #endif
+      };
+    };
+  };
+};
 
-#pragma keylist ShapeType color
 
-#pragma DCPS_DATA_TYPE "Attributes"
-#pragma DCPS_DATA_KEY "Attributes shape"
-#pragma DCPS_DATA_KEY "Attributes color"
+#pragma keylist ShapeType color
 
-struct Attributes {
-  string shape; //@key
-  string color; //@key
-  float speed;
+#pragma DCPS_DATA_TYPE "org::omg::dds::demo::Attributes"
+#pragma DCPS_DATA_KEY "org::omg::dds::demo::Attributes shape"
+#pragma DCPS_DATA_KEY "org::omg::dds::demo::Attributes color"
+
+module org {
+  module omg {
+    module dds {
+      module demo {
+        struct Attributes {
+          string shape; //@key
+          string color; //@key
+          float speed;
+        };
+      };
+    };
+  };
 };
 
 // #pragma DCPS_DATA_SEQUENCE_TYPE "AttributesSeq"
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
index eb57ee73d2c..556d3c7c274 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
@@ -19,7 +19,7 @@
 # include "Base/Shapes_BaseTypeSupport.idl"
 #endif
 
-module ::CCM_DDS::Typed < ::ShapeType, ::ShapeTypeSeq> Shapes;
+module ::CCM_DDS::Typed < ::org::omg::dds::demo::ShapeType, ::org::omg::dds::demo::ShapeTypeSeq> Shapes;
 
 #endif /* SHAPES_CONNECTOR_IDL_ */
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
index 4bdaaddbe1d..0e5ac3b2c5e 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
@@ -38,6 +38,12 @@
 #include /**/ "Receiver_exec_export.h"
 #include "tao/LocalObject.h"
 
+// 2013 version of the DDS shapes example moves
+// the ShapeType to a nested module
+using org::omg::dds::demo::ShapeType;
+using org::omg::dds::demo::ShapeTypeSeq;
+using org::omg::dds::demo::ShapeType_var;
+
 namespace CIAO_Shapes_Receiver_Impl
 {
   class Receiver_exec_i;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
index 3148b6c896b..a748c12d50a 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
@@ -38,6 +38,12 @@
 #include /**/ "Sender_exec_export.h"
 #include "tao/LocalObject.h"
 
+// 2013 version of the DDS shapes example moves
+// the ShapeType to a nested module
+using org::omg::dds::demo::ShapeType;
+using org::omg::dds::demo::ShapeTypeSeq;
+using org::omg::dds::demo::ShapeType_var;
+
 namespace CIAO_Shapes_Sender_Impl
 {
   class Sender_exec_i;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp
index 26c17b19e41..a30193272dd 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp
@@ -229,6 +229,17 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>type_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>ShapeType</string>
+        </value>
+      </value>
+    </configProperty>
   </instance>
   <instance xmi:id="Shapes_ConnectorComponentInstance2">
     <name>Shapes_ConnectorComponent2</name>
@@ -247,6 +258,17 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>type_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>ShapeType</string>
+        </value>
+      </value>
+    </configProperty>
   </instance>
   <instance xmi:id="SenderComponentInstance">
     <name>SenderComponent</name>