Mon Nov 9 12:43:45 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl:
        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc:
        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl:
        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.mpc:
        * connectors/dds4ccm/examples/Shapes/Sender/Sender.idl:
        * connectors/dds4ccm/examples/Shapes/Sender/Sender.mpc:
        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl3:
        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl3p:
        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl3:
        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl3p:
        * connectors/dds4ccm/examples/Shapes/Sender/Sender.idl3:
        * connectors/dds4ccm/examples/Shapes/Sender/Sender.idl3p:
          Removed idl3p files and renamed idl3 extention to idl.
          Inserted the content of the idl3p files at the bottom of
          the idl files.

10 files changed, 73 insertions, 80 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 45626ed9b25..df0d3c8e311 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,21 @@
+Mon Nov  9 12:43:45 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl:
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.mpc:
+        * connectors/dds4ccm/examples/Shapes/Sender/Sender.idl:
+        * connectors/dds4ccm/examples/Shapes/Sender/Sender.mpc:
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl3:
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl3p:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl3:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl3p:
+        * connectors/dds4ccm/examples/Shapes/Sender/Sender.idl3:
+        * connectors/dds4ccm/examples/Shapes/Sender/Sender.idl3p:
+          Removed idl3p files and renamed idl3 extention to idl.
+          Inserted the content of the idl3p files at the bottom of
+          the idl files.
+
 Mon Nov  9 12:13:48 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/examples/Shapes/Sender/Sender_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl3 b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
index b83bcdfe255..ffd9878cc52 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl3
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
@@ -1,14 +1,14 @@
 // $Id$
 
 /**
- * @file Shapes_Connector.idl3
+ * @file Shapes_Connector.idl
  * @author Marcel Smit <msmit@remedy.nl>
  *
  * by-hand translation of the idl3p.
  */
 
-#ifndef SHAPES_CONNECTOR_IDL3_
-#define SHAPES_CONNECTOR_IDL3_
+#ifndef SHAPES_CONNECTOR_IDL_
+#define SHAPES_CONNECTOR_IDL_
 
 #include  <Components.idl>
 #include "dds4ccm/idl/dds4ccm_ListenerControl.idl3"
@@ -145,4 +145,23 @@ module Shapes
   };
 };
 
-#endif /* SHAPES_CONNECTOR_IDL3_ */
+
+/*
+For future use: IDL3 plus
+#include <dds4ccm/idl/dds4ccm_Connector_Base.idl3p>
+#include <dds4ccm/idl/dds4ccm_Port_RawListen.idl3p>
+#include <dds4ccm/idl/dds4ccm_Port_Write.idl3p>
+
+module Shapes
+{
+  connector Shapes_Connector : CCM_DDS::DDS_TopicBase
+  {
+    mirrorport CCM_DDS::DDS_Write <Shape_Info> info_in;
+    mirrorport CCM_DDS::DDS_RawListen <Shape_Info> info_out;
+  };
+};
+*/
+
+#endif /* SHAPES_CONNECTOR_IDL_ */
+
+
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl3p b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl3p
deleted file mode 100644
index 38049f250bd..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl3p
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-/**
- * @file 
- * @author Marcel Smit <msmit@remedy.nl>
- *
- * IDL3P description of the shapes connector.
- */
-#ifndef SHAPES_CONNECTOR_IDL3P
-#define SHAPES_CONNECTOR_IDL3P
-
-#include <dds4ccm/idl/dds4ccm_Connector_Base.idl3p>
-#include <dds4ccm/idl/dds4ccm_Port_RawListen.idl3p>
-#include <dds4ccm/idl/dds4ccm_Port_Write.idl3p>
-
-module Shapes
-{
-  connector Shapes_Connector : CCM_DDS::DDS_TopicBase
-  {
-    mirrorport CCM_DDS::DDS_Write <Shape_Info> info_in;
-    mirrorport CCM_DDS::DDS_RawListen <Shape_Info> info_out;
-  };
-};
-
-#endif /* SHAPES_CONNECTOR_IDL3P */
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
index 46f227ac5a1..2fac3a28494 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
@@ -13,7 +13,7 @@ project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults, componentidldefaul
               -I ..
 
   IDL_Files {
-    Shapes_Connector.idl3
+    Shapes_Connector.idl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl3 b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl
index 36f0adfda52..5a226115392 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl3
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl
@@ -5,10 +5,10 @@
  * @author Marcel Smit <msmit@remedy.nl>
  */
 
-#ifndef RECEIVER_IDL3
-#define RECEIVER_IDL3
+#ifndef RECEIVER_IDL
+#define RECEIVER_IDL
 
-#include "Connector/Shapes_Connector.idl3"
+#include "Connector/Shapes_Connector.idl"
 #include "Connector/Shapes_ConnectorE.idl"
 
 module Shapes
@@ -27,4 +27,17 @@ module Shapes
   };
 };
 
+/*
+For future use: IDL3 plus
+#include <dds4ccm/idl/dds4ccm_Connector_Base.idl3p>
+#include <dds4ccm/idl/dds4ccm_Port_RawListen.idl3p>
+
+module Shapes
+{
+  component Receiver
+  {
+    port CCM_DDS::DDS_RawListen <Shape_Info> info;
+  };
+};
+*/
 #endif
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl3p b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl3p
deleted file mode 100644
index 3ed223133fa..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl3p
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-/**
- * @file 
- * @author Marcel Smit <msmit@remedy.nl>
- *
- */
-
-#ifndef RECEIVER_IDL3P
-#define RECEIVER_IDL3P
-
-#include <dds4ccm/idl/dds4ccm_Connector_Base.idl3p>
-#include <dds4ccm/idl/dds4ccm_Port_RawListen.idl3p>
-
-module Shapes
-{
-  component Receiver
-  {
-    port CCM_DDS::DDS_RawListen <Shape_Info> info;
-  };
-};
-
-#endif /* RECEIVER_IDL3P */
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.mpc
index bd1a08850c1..58fbc870e21 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.mpc
@@ -12,7 +12,7 @@ project(DDS_Receiver_idl_gen) : componentidldefaults , connectoridldefaults  {
               -Wb,exec_export_include=Receiver_exec_export.h -I..
 
   IDL_Files {
-    Receiver.idl3
+    Receiver.idl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.idl3 b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.idl
index 4bd24037877..135fcc35fb1 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.idl3
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.idl
@@ -7,10 +7,10 @@
  * by-hand idl3 translation of sender components.
  */
 
-#ifndef DDS_SENDER_IDL3
-#define DDS_SENDER_IDL3
+#ifndef DDS_SENDER_IDL
+#define DDS_SENDER_IDL
 
-#include "Connector/Shapes_Connector.idl3"
+#include "Connector/Shapes_Connector.idl"
 #include "Connector/Shapes_ConnectorE.idl"
 
 module Shapes
@@ -33,4 +33,14 @@ module Shapes
   };
 };
 
+/*
+For future use: IDL3 plus
+module Shapes
+{
+  component Sender
+  {
+    port CCM_DDS::DDS_Write <Shape_Info> info;
+  };
+};
+*/
 #endif
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.idl3p b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.idl3p
deleted file mode 100644
index 07a9bf5c184..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.idl3p
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-/**
- * @file 
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef DDS_SENDER_IDL3P
-#define DDS_SENDER_IDL3P
-
-module Shapes
-{
-  component Sender
-  {
-    port CCM_DDS::DDS_Write <Shape_Info> info;
-  };
-};
-
-#endif /* DDS_SENDER_IDL3P */
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.mpc
index 2bcf005711c..8c0ca2f8433 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.mpc
@@ -13,7 +13,7 @@ project(DDS_Sender_idl_gen) : connectoridldefaults, componentidldefaults   {
               -I ..
 
   IDL_Files {
-    Sender.idl3
+    Sender.idl
   }
 }