ChangeLogTag:Tue Feb 20 17:59:51 UTC 2007 William R. Otte <wotte@dre.vanderbilt.edu>

11 files changed, 31 insertions, 45 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 9d54b484b82..e97ebae1880 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,19 @@
+Tue Feb 20 17:59:51 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/Deployment/Deployment_TargetManager.idl
+        * DAnCE/Deployment/DAnCE_Core.mpc
+        * DAnCE/TargetManager/DomainDataManager.h
+        * DAnCE/TargetManager/TargetManager.mpc
+        * DAnCE/TargetManager/CmpClient.cpp
+        * DAnCE/TargetManager/ResourceCommitmentManager.h
+        * DAnCE/TargetManager/TargetManagerImpl.idl
+        * DAnCE/NodeApplication/Container_Impl.h
+        * ciao/Context_Impl_Base.h
+        * ciao/Swapping_Container.cpp
+        
+          Cleared up compile errors from
+          Tue Feb 20 16:17:46 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
 Tue Feb 20 17:48:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Context_Impl_Base.h:
diff --git a/CIAO/DAnCE/Deployment/DAnCE_Core.mpc b/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
index 0360fa9b43a..7c45fd1c175 100644
--- a/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
+++ b/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
@@ -32,10 +32,10 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
     Deployment_TargetData.idl
     Deployment_Events.idl
     CIAO_ServerResources.idl
-    Deployment_ResourceCommitmentManager.idl
   }
 
   IDL_Files {
+    Deployment_ResourceCommitmentManager.idl
     Deployment_TargetManager.idl
     CIAO_NodeApplication_CallBack.idl
     Deployment_Core.idl
@@ -110,10 +110,10 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien
     Deployment_DomainApplicationManagerS.cpp
     Deployment_DomainApplicationS.cpp
     Deployment_ExecutionManagerS.cpp
-    Deployment_ResourceCommitmentManagerS.cpp
     NodeApp_CB_Impl.cpp
     Deployment_TargetManagerS.cpp
     CIAO_NodeApplication_CallBackS.cpp
+    Deployment_ResourceCommitmentManagerS.cpp
   }
 
 }
diff --git a/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl b/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl
index 1ed8c907808..91a9c849099 100644
--- a/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl
@@ -8,6 +8,7 @@
 #include "DAnCE/Deployment/Deployment_DeploymentPlan.idl"
 // Only needed for ResourceNotAvailable but that should go, so this include also
 #include "DAnCE/Deployment/Deployment_ApplicationManager.idl"
+#include "DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl"
 
 module Deployment {
 
@@ -19,53 +20,21 @@ module Deployment {
     // @@changed
     UpdateDynamic
   };
-
-  /**
-   * @todo The ResourceCommitmentManager is part of 06-04-01 and this is not
-   * part of the Target Manager yet
-   */
-//   // @@add for conformance to 06-02-01
-//   struct ResourceAllocation {
-//     string elementName;
-//     string resourceName;
-//     Properties property;
-//   };
-  
-//   // @@added for conformance to 06-02-01
-//   exception ResourceCommitmentFailure {
-//     string reason;
-//     long index;
-//     string propertyName;
-//     ::CORBA::AnySeq propertyValue;
-//   };
-  
-//   // @@added for conformance to 06-02-01
-//   interface ResourceCommitmentManager {    
-//     void commitResources (in ResourceAllocations resources)
-//       raises (ResourceCommitmentFailure);
-
-//     void releaseResources (in ResourceAllocations resources)
-//       raises (ResourceCommitmentFailure);
-//   };
   
   interface TargetManager {
     Domain getAllResources ();
     Domain getAvailableResources ();
-    /// @todo 06-04-01 specifies this differently
-    void commitResources (in DeploymentPlan plan)
-      raises (ResourceNotAvailable, PlanError);
-    
+
     // @@changed
-    //     ResourceCommitmentManager commitResources (in ResourceAllocations
-    //                                                resources)
-    //       raises (ResourceCommitmentFailure);
+    ResourceCommitmentManager createResourceCommitment (in ResourceAllocations resources)
+      raises (ResourceCommitmentFailure);
     
     // @@added
-    // void destroyResourceCommitment (in ResourceCommitmentManager manager);
+    void destroyResourceCommitment (in ResourceCommitmentManager manager);
 
     /// @todo This is not part of 06-04-01
     // @@delete:
-    void releaseResources (in DeploymentPlan argname);
+    //void releaseResources (in DeploymentPlan argname);
 
     void updateDomain (in ::CORBA::StringSeq elements,
                        in Domain domainSubset,
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.h b/CIAO/DAnCE/NodeApplication/Container_Impl.h
index 3ccfa27935f..b3841f8f491 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.h
@@ -27,7 +27,7 @@
 
 #include "DAnCE/Deployment/Deployment_ContainerS.h"
 #include "DAnCE/Deployment/Deployment_NodeApplicationC.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment//DeploymentC.h"
 #include "ciao/Session_Container.h"
 #include "ace/SString.h"
 #include "ciao/Server_init.h"  // write_IOR function & NameUtility
diff --git a/CIAO/DAnCE/TargetManager/CmpClient.cpp b/CIAO/DAnCE/TargetManager/CmpClient.cpp
index d221f9883d6..dd33cf71256 100644
--- a/CIAO/DAnCE/TargetManager/CmpClient.cpp
+++ b/CIAO/DAnCE/TargetManager/CmpClient.cpp
@@ -10,6 +10,7 @@
  */
 
 #include "DAnCE/Deployment/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_ResourceCommitmentManagerC.h"
 #include "DAnCE/TargetManager/TargetManagerImplC.h"
 #include "ace/streams.h"
 #include "ace/FILE_IO.h"
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.h b/CIAO/DAnCE/TargetManager/DomainDataManager.h
index 93995df0da4..e32ba09a6d0 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -16,6 +16,7 @@
 
 #include "TargetManagerImplC.h"
 #include "DAnCE/DomainApplicationManager/Deployment_Configuration.h"
+#include "DAnCE/Deployment/Deployment_ResourceCommitmentManagerC.h"
 
 /**
  * @namespace CIAO
diff --git a/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
index b238da53779..99a21a797bc 100644
--- a/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
+++ b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
@@ -11,7 +11,7 @@
 #ifndef DEPLOYMENT_RESOURCECOMMITMENTMANAGERI_H_
 #define DEPLOYMENT_RESOURCECOMMITMENTMANAGERI_H_
 
-#include "Deployment_ResourceCommitmentManagerS.h"
+#include "DAnCE/Deployment/Deployment_ResourceCommitmentManagerS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/CIAO/DAnCE/TargetManager/TargetManager.mpc b/CIAO/DAnCE/TargetManager/TargetManager.mpc
index c0d7f90c77a..fd360ac0846 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -10,6 +10,7 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub, ciao_no
 
   IDL_Files {
     TargetManagerImpl.idl
+    TargetManagerExt.idl
     DomainEvents.idl
   }
 
diff --git a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl b/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
index 5f01aee1948..5f6c37d8e71 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 "DAnCE/Deployment/Deployment_Target_Data.idl"
+#include "DAnCE/Deployment/Deployment_PlanError.idl"
 #include "TargetManagerExt.idl"
 #include "DomainEvents.idl"
 
diff --git a/CIAO/ciao/Context_Impl_Base.h b/CIAO/ciao/Context_Impl_Base.h
index 0a92a7475f0..1c5bcf9ea4b 100644
--- a/CIAO/ciao/Context_Impl_Base.h
+++ b/CIAO/ciao/Context_Impl_Base.h
@@ -78,8 +78,6 @@ namespace CIAO
 
     virtual void set_rollback_only ();
 
-    virtual CORBA::Object * resolve_service_reference (const char *service_id);
-
     virtual CORBA::Object_ptr resolve_service_reference(const char *service_id);
 
     // CIAO-specific.
diff --git a/CIAO/ciao/Swapping_Container.cpp b/CIAO/ciao/Swapping_Container.cpp
index 432c4945f46..f4e7af10e97 100644
--- a/CIAO/ciao/Swapping_Container.cpp
+++ b/CIAO/ciao/Swapping_Container.cpp
@@ -5,7 +5,7 @@
 #include "ace/DLL.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "ace/OS_NS_stdio.h"
-#include "ciao/Deployment_CoreC.h"
+#include "DAnCE/Deployment//Deployment_CoreC.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Swapping_Container.inl"