ChangeLogTag:Thu Aug 3 20:38:39 UTC 2006 Nanbor Wang <nanbor (at) txcorp (dot) com>

5 files changed, 25 insertions, 11 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index b6fd879b7e2..1cf1d09f1e2 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Aug  3 20:38:39 UTC 2006  Nanbor Wang  <nanbor (at) txcorp (dot) com>
+
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+          
+          Fixed RT-CCM support.  
+        
 Thu Aug  3 15:33:11 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
 
         * docs/cidlc.html:
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index a9fe01d3e94..5445716beb8 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -717,7 +717,7 @@ install_all_es (void)
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
-                            "DomainApplicationManager_Impl::post_finishLaunch.\n");
+                            "DomainApplicationManager_Impl::install_all_es.\n");
       ACE_RE_THROW;
     }
   ACE_ENDTRY;
diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
index 67f0f9d7363..0fd31205beb 100644
--- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -85,17 +85,15 @@ namespace CIAO
         CORBA::String_var my_resource_id ("");
         const char *my_policy_set_id = "";
 
+        // @@ super hack here.  we are assuming RT policy set is
+        // the only thing that will be specified.
         if (this->plan_.instance[i].deployedResource.length () != 0)
           {
-            /*
             my_resource_id =
               this->plan_.instance[i].deployedResource[0].resourceName.in ();
 
-            this->plan_.instance[i].deployedResource[0].resourceValue >>=
+            this->plan_.instance[i].deployedResource[0].property[0].value >>=
               my_policy_set_id;
-            */
-
-            // ACE_ERROR ((LM_ERROR, "ERROR: RT-CCM support has been disabled until code in Containers_Info_Map is updated to reflect IDL changes."));
           }
 
         // If we find a existing policy_set_id, then do nothing.
diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index 03e2f530251..ceb8c8414ac 100644
--- a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -41,9 +41,16 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
   // instance in this NodeApplication should have the same "server_resource_def"
   // defined. Since currently we ignored this sanity check, then will allow
   // users to specify some self-conflicting configuration in the descriptor.
+
+  // NW: this stuff is broken because it assumes all component
+  // instances in a node will use the same ServerResource file.  This
+  // is not the case.  Component instances using the same
+  // ServerResource file will be deployed in the same NA.  However,
+  // those using different ServerResource files should be deployed to
+  // different NAs.  Something to be fixed later.
   for (i = 0; i < instance_len; ++i)
     {
-      if (false && this->plan_.instance[i].deployedResource.length () != 0)
+      if (this->plan_.instance[i].deployedResource.length () != 0)
         {
           target_resource_id =
             this->plan_.instance[i].deployedResource[0].resourceName.in ();
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 3028dd3171d..1f74b9849ca 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -589,9 +589,9 @@ validate_plan (const Deployment::DeploymentPlan &plan)
           // are checking to make sure that all component instances have
           // the same server_resource_id.
 
-          //resource_id =
-          //  plan.instance[i].deployedResource[0].resourceName.in ();
-          //break;
+          resource_id =
+            plan.instance[i].deployedResource[0].resourceName.in ();
+          break;
         }
     }
   if (i == plan.instance.length ()) // No server resource id has been set for any instance
@@ -600,7 +600,7 @@ validate_plan (const Deployment::DeploymentPlan &plan)
   for (i = 0; i < plan.instance.length (); ++i)
     {
       const char * my_resource_id;
-      if (true || plan.instance[i].deployedResource.length () == 0)
+      if (plan.instance[i].deployedResource.length () == 0)
         {
           continue;
         }