Thu Feb 14 16:06:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 31 insertions, 19 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index a3ff35d493a..3d32e4265ec 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Thu Feb 14 16:06:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Deployment_Target_Data.idl:
+        * ciao/Deployment_PlanError.idl:
+          Renamed Target_Data to PlanError
+
+        * ciao/CCM_Core.mpc:
+        * ciao/Deployment.idl:
+        * ciao/Deployment_TargetManager.idl:
+        * DAnCE/TargetManager/TargetManagerImpl.idl:
+          Updated because of rename above
+
 Thu Feb 14 16:00:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/CCM_CCMException.idl:
diff --git a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl b/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
index 1d5887745c5..53ad88d8b6e 100644
--- a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
+++ b/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
@@ -11,7 +11,7 @@
 #define TARGETMGR_IDL
 
 #include "ciao/Components.idl"
-#include "ciao/Deployment_Target_Data.idl"
+#include "ciao/Deployment_PlanError.idl"
 #include "DomainEvents.idl"
 
 module CIAO
diff --git a/CIAO/ciao/CCM_Core.mpc b/CIAO/ciao/CCM_Core.mpc
index 494ff185b49..7f4adacc21b 100644
--- a/CIAO/ciao/CCM_Core.mpc
+++ b/CIAO/ciao/CCM_Core.mpc
@@ -191,7 +191,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
   IDL_Files {
     idlflags += -SS -Sci
     Deployment_Packaging_Data.idl
-    Deployment_Target_Data.idl
+    Deployment_PlanError.idl
   }
 
   IDL_Files {
@@ -233,7 +233,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
     Deployment_ApplicationC.cpp
     Deployment_ContainerC.cpp
     Deployment_Packaging_DataC.cpp
-    Deployment_Target_DataC.cpp
+    Deployment_PlanErrorC.cpp
     DeploymentC.cpp
     Deployment_TargetManagerC.cpp
     Deployment_NodeManagerC.cpp
diff --git a/CIAO/ciao/Deployment.idl b/CIAO/ciao/Deployment.idl
index 793c44fc853..ada45d81f43 100644
--- a/CIAO/ciao/Deployment.idl
+++ b/CIAO/ciao/Deployment.idl
@@ -4,7 +4,7 @@
 #define DEPLOYMENT_IDL
 
 #include "ciao/Deployment_Packaging_Data.idl"
-#include "ciao/Deployment_Target_Data.idl"
+#include "ciao/Deployment_PlanError.idl"
 
 module Deployment {
 
diff --git a/CIAO/ciao/Deployment_PlanError.idl b/CIAO/ciao/Deployment_PlanError.idl
new file mode 100644
index 00000000000..2816db930dd
--- /dev/null
+++ b/CIAO/ciao/Deployment_PlanError.idl
@@ -0,0 +1,14 @@
+// $Id$
+
+#ifndef DEPLOYMENT_PLANERROR_IDL
+#define DEPLOYMENT_PLANERROR_IDL
+
+module Deployment {
+
+  exception PlanError {
+    string name;
+    string reason;
+  };
+};
+
+#endif /* DEPLOYMENT_PLANERROR_IDL */
diff --git a/CIAO/ciao/Deployment_TargetManager.idl b/CIAO/ciao/Deployment_TargetManager.idl
index 0a3522d21fe..d42de538fd1 100644
--- a/CIAO/ciao/Deployment_TargetManager.idl
+++ b/CIAO/ciao/Deployment_TargetManager.idl
@@ -3,7 +3,7 @@
 #ifndef TARGETMANAGER_IDL
 #define TARGETMANAGER_IDL
 
-#include "ciao/Deployment_Target_Data.idl"
+#include "ciao/Deployment_PlanError.idl"
 #include "ciao/Deployment_TargetData.idl"
 #include "ciao/Deployment_DeploymentPlan.idl"
 #include "ciao/Deployment_ResourceCommitmentManager.idl"
diff --git a/CIAO/ciao/Deployment_Target_Data.idl b/CIAO/ciao/Deployment_Target_Data.idl
deleted file mode 100644
index 0e08248972a..00000000000
--- a/CIAO/ciao/Deployment_Target_Data.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-#ifndef TARGET_DATA_IDL
-#define TARGET_DATA_IDL
-
-module Deployment {
-
-  exception PlanError {
-    string name;
-    string reason;
-  };
-};
-
-#endif /* TARGET_DATA_IDL */