Fri Jan 19 17:44:42 UTC 2007 Nishanth Shankaran <nshankar@nospam.com>

16 files changed, 83 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e6f695cd7a..f7259c232be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Fri Jan 19 17:44:42 UTC 2007  Nishanth Shankaran  <nshankar@nospam.com>
+
+        * Controller/Component/Controller.idl:
+        * Controller/Component/Interface.idl:
+        * Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl:
+        * Monitor/Central_Monitor/Monitor.idl:
+        * Monitor/Central_Monitor/Monitor.mpc:
+        * Monitor/Local_Monitor/Local_Monitor.h:
+        * Monitor/Local_Monitor/Local_Monitor.cpp:
+        * Monitor/Local_Monitor/Local_Monitor.mpc:
+        * Output_Adapters/Interface/PlanEgress.idl:
+        * Plan_Analyzer/Interface/Analyzer_I.idl:
+        * Plan_Analyzer/Interface/PlanIngress.idl:
+        * Planner_Manager/Interface/Planner_Manager_I.idl:
+        * Planners/Interface/Planner_I.idl:
+        * Planners/StaticPlanner/StaticPlanner.idl:
+        * common/RACE_common.idl: Fixed the IDL files to be consistent
+          with the recent refactoring of CIAO IDL files.
+
 Thu Nov 30 19:00:22 UTC 2006  Nishanth Shankaran  <nshankar@nospam.com>
 
         * Controller/Component/Controller.mpc:
diff --git a/Controller/Component/Controller.idl b/Controller/Component/Controller.idl
index 7362a9c7875..8c3af3285d8 100644
--- a/Controller/Component/Controller.idl
+++ b/Controller/Component/Controller.idl
@@ -12,7 +12,7 @@
  */
 
 #include <Components.idl>
-#include "ciao/Target_Data.idl"
+#include "ciao/Deployment_Target_Data.idl"
 #include "TargetManager/TargetManagerExt.idl"
 #include "Interface.idl"
 #include "RACE/Monitor/Central_Monitor/Monitor.idl"
diff --git a/Controller/Component/Interface.idl b/Controller/Component/Interface.idl
index dbb6af505dd..c298c3994a6 100644
--- a/Controller/Component/Interface.idl
+++ b/Controller/Component/Interface.idl
@@ -1,7 +1,7 @@
 #ifndef RACE_CONTROLLER_INTERFACE_IDL
 #define RACE_CONTROLLER_INTERFACE_IDL
 
-#include "ciao/Packaging_Data.idl"
+#include "ciao/Deployment_Packaging_Data.idl"
 
 module CIAO
 {
diff --git a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl
index 987855a3703..8aa415a86a5 100644
--- a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl
+++ b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl
@@ -5,7 +5,7 @@
 #include <Components.idl>
 #include "RACE/Input_Adapters/Base/Input_Adapter.idl"
 #include "RACE/common/RACE_common.idl"
-#include "ciao/Packaging_Data.idl"
+#include "ciao/Deployment_Packaging_Data.idl"
 
 module CIAO
 {
diff --git a/Monitor/Central_Monitor/Monitor.idl b/Monitor/Central_Monitor/Monitor.idl
index 983027a77f5..3137b97d5d3 100644
--- a/Monitor/Central_Monitor/Monitor.idl
+++ b/Monitor/Central_Monitor/Monitor.idl
@@ -2,23 +2,24 @@
 #define RACE_MONITOR_IDL
 
 #include <Components.idl>
+#include "Interface.idl"
 
 module CIAO
 {
   module RACE
   {
-    typedef sequence<long> Delays;
+//     typedef sequence<long> Delays;
 
-    interface Execution_Time_Monitor
-    {
-      exception IdNotFound
-      {
-      };
+//     interface Execution_Time_Monitor
+//     {
+//       exception IdNotFound
+//       {
+//       };
 
-      oneway void push_delays (in string id, in Delays delay);
+//       oneway void push_delays (in string id, in Delays delay);
 
-      Delays get_delays (in string id) raises (IdNotFound);
-    };
+//       Delays get_delays (in string id) raises (IdNotFound);
+//     };
 
     component Central_Monitor
     {
diff --git a/Monitor/Central_Monitor/Monitor.mpc b/Monitor/Central_Monitor/Monitor.mpc
index 892c285232f..10cc89c0022 100644
--- a/Monitor/Central_Monitor/Monitor.mpc
+++ b/Monitor/Central_Monitor/Monitor.mpc
@@ -1,10 +1,47 @@
+project(Monitor_Interface_stub): taolib_with_idl {
+
+  sharedname = Monitor_Interface_stub
+  idlflags -= -GT
+  idlflags += -St \
+              -Wb,stub_export_macro=INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Interface_stub_export.h \
+              -Wb,skel_export_macro=INTERFACE_SVNT_Export \
+              -Wb,skel_export_include=Interface_svnt_export.h
+  dynamicflags   = INTERFACE_STUB_BUILD_DLL
+
+  IDL_Files {
+    Interface.idl
+  }
+
+  Source_Files {
+    InterfaceC.cpp
+  }
+}
+project(Monitor_Interface_svnt): taolib_with_idl, portableserver {
+
+  after += Monitor_Interface_stub
+  sharedname = Monitor_Interface_svnt
+  libs += Monitor_Interface_stub
+
+  dynamicflags = INTERFACE_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    InterfaceS.cpp
+  }
+}
+
 project(Monitor_stub): ciao_client_dnc {
 
-  sharedname = Monitor_stub
+  after += Monitor_Interface_stub
+  sharedname = Interface_Monitor_svnt
   idlflags += -Wb,stub_export_macro=MONITOR_STUB_Export \
               -Wb,stub_export_include=Monitor_stub_export.h \
               -Wb,skel_export_macro=MONITOR_SVNT_Export \
               -Wb,skel_export_include=Monitor_svnt_export.h
+  libs     += Monitor_Interface_stub
   dynamicflags   = MONITOR_STUB_BUILD_DLL
 
   IDL_Files {
@@ -19,7 +56,7 @@ project(Monitor_stub): ciao_client_dnc {
 project(Monitor_svnt) : ciao_servant_dnc {
   after +=  Monitor_stub
   sharedname  = Monitor_svnt
-  libs    += Monitor_stub
+  libs    += Monitor_Interface_stub Monitor_Interface_svnt Monitor_stub
 
   idlflags  +=  -Wb,export_macro=MONITOR_SVNT_Export \
                 -Wb,export_include=Monitor_svnt_export.h
diff --git a/Monitor/Local_Monitor/Local_Monitor.cpp b/Monitor/Local_Monitor/Local_Monitor.cpp
index 0863a35026e..9f03603116e 100644
--- a/Monitor/Local_Monitor/Local_Monitor.cpp
+++ b/Monitor/Local_Monitor/Local_Monitor.cpp
@@ -2,6 +2,7 @@
 #include "ace/Reactor.h"
 #include "orbsvcs/CosNamingC.h"
 #include "tao/ORB_Core.h"
+#include "RACE/Monitor/Central_Monitor/MonitorC.h"
 
 namespace CIAO
 {
diff --git a/Monitor/Local_Monitor/Local_Monitor.h b/Monitor/Local_Monitor/Local_Monitor.h
index 4971b80545d..24a000427fa 100644
--- a/Monitor/Local_Monitor/Local_Monitor.h
+++ b/Monitor/Local_Monitor/Local_Monitor.h
@@ -6,7 +6,7 @@
 #include "ace/Mutex.h"
 #include "ace/High_Res_Timer.h"
 #include "orbsvcs/Naming/Naming_Server.h"
-#include "RACE/Monitor/Central_Monitor/MonitorC.h"
+#include "RACE/Monitor/Central_Monitor/InterfaceC.h"
 #include "Local_Monitor_export.h"
 
 namespace CIAO
diff --git a/Monitor/Local_Monitor/Local_Monitor.mpc b/Monitor/Local_Monitor/Local_Monitor.mpc
index faf971df929..0f4c36e733e 100644
--- a/Monitor/Local_Monitor/Local_Monitor.mpc
+++ b/Monitor/Local_Monitor/Local_Monitor.mpc
@@ -1,7 +1,7 @@
-project(Local_Monitor):ciao_client_dnc, naming, ciao_race_default{
+project(Local_Monitor): ciao_client_dnc, naming, ciao_race_default, portableserver{
   sharedname = Local_Monitor
   after += Monitor_stub
-  libs += Monitor_stub
+  libs += Monitor_Interface_stub Monitor_stub
 
   dynamicflags   = LOCAL_MONITOR_BUILD_DLL
 
diff --git a/Output_Adapters/Interface/PlanEgress.idl b/Output_Adapters/Interface/PlanEgress.idl
index 98ce91a81f1..a3edaa17d1a 100644
--- a/Output_Adapters/Interface/PlanEgress.idl
+++ b/Output_Adapters/Interface/PlanEgress.idl
@@ -2,7 +2,7 @@
 #ifndef RACE_PLAN_EGRESS_IDL
 #define RACE_PLAN_EGRESS_IDL
 
-#include "ciao/Packaging_Data.idl"
+#include "ciao/Deployment_Packaging_Data.idl"
 #include "RACE/common/RACE_common.idl"
 
 module CIAO
diff --git a/Plan_Analyzer/Interface/Analyzer_I.idl b/Plan_Analyzer/Interface/Analyzer_I.idl
index c1c97e831d2..e43cb9c40bd 100644
--- a/Plan_Analyzer/Interface/Analyzer_I.idl
+++ b/Plan_Analyzer/Interface/Analyzer_I.idl
@@ -3,7 +3,7 @@
 #ifndef RACE_ANALYZER_I_IDL
 #define RACE_ANALYZER_I_IDL
 
-#include "ciao/Packaging_Data.idl"
+#include "ciao/Deployment_Packaging_Data.idl"
 #include "RACE/common/RACE_common.idl"
 
 module CIAO
diff --git a/Plan_Analyzer/Interface/PlanIngress.idl b/Plan_Analyzer/Interface/PlanIngress.idl
index 1197db6b515..773cc86a889 100644
--- a/Plan_Analyzer/Interface/PlanIngress.idl
+++ b/Plan_Analyzer/Interface/PlanIngress.idl
@@ -2,7 +2,7 @@
 #ifndef RACE_PLAN_INGRESS_IDL
 #define RACE_PLAN_INGRESS_IDL
 
-#include "ciao/Packaging_Data.idl"
+#include "ciao/Deployment_Packaging_Data.idl"
 #include "RACE/common/RACE_common.idl"
 module CIAO
 {
diff --git a/Planner_Manager/Interface/Planner_Manager_I.idl b/Planner_Manager/Interface/Planner_Manager_I.idl
index 3fa18789734..c54e2eb5cd9 100644
--- a/Planner_Manager/Interface/Planner_Manager_I.idl
+++ b/Planner_Manager/Interface/Planner_Manager_I.idl
@@ -2,7 +2,7 @@
 #ifndef RACE_PLANNER_MANAGER_I_IDL
 #define RACE_PLANNER_MANAGER_I_IDL
 
-#include "ciao/Packaging_Data.idl"
+#include "ciao/Deployment_Packaging_Data.idl"
 
 #include "RACE/common/RACE_common.idl"
 
diff --git a/Planners/Interface/Planner_I.idl b/Planners/Interface/Planner_I.idl
index 9c0fadacf9d..3d2ffe9da66 100644
--- a/Planners/Interface/Planner_I.idl
+++ b/Planners/Interface/Planner_I.idl
@@ -1,8 +1,7 @@
-// Planner_I.idl,v 1.1 2005/09/06 19:57:22 wotte Exp
 #ifndef RACE_PLANNER_I_IDL
 #define RACE_PLANNER_I_IDL
 
-#include "Packaging_Data.idl"
+#include "ciao/Deployment_Packaging_Data.idl"
 #include "RACE/common/RACE_common.idl"
 
 module CIAO
diff --git a/Planners/StaticPlanner/StaticPlanner.idl b/Planners/StaticPlanner/StaticPlanner.idl
index 45351b17605..1f68d50a5e5 100644
--- a/Planners/StaticPlanner/StaticPlanner.idl
+++ b/Planners/StaticPlanner/StaticPlanner.idl
@@ -5,7 +5,7 @@
 
 #include <Components.idl>
 #include "../Base/Planner.idl"
-#include "ciao/Target_Data.idl"
+#include "ciao/Deployment_TargetManager.idl"
 
 module CIAO
 {
@@ -15,7 +15,7 @@ module CIAO
     {
       uses ::Deployment::TargetManager target_mgr;
     };
-    
+
     home StaticPlanner_Home manages StaticPlanner
     {
     };
diff --git a/common/RACE_common.idl b/common/RACE_common.idl
index f21a8978601..ed33c09a55f 100644
--- a/common/RACE_common.idl
+++ b/common/RACE_common.idl
@@ -1,7 +1,7 @@
 #ifndef RACE_COMMON_IDL
 #define RACE_COMMON_IDL
 
-#include "ciao/Packaging_Data.idl"
+#include "ciao/Deployment_Packaging_Data.idl"
 
 module CIAO
 {