ChangeLogTag: Fri Dec 12 23:31:02 UTC 2008 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>

4 files changed, 37 insertions, 5 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 266cdba5a24..b652de875e1 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,20 @@
+Fri Dec 12 23:31:02 UTC 2008  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
+
+        * DAnCE/NodeManager/Node_Manager_Module.cpp:
+        
+          Changed ACE_Get_Opt initialization not to parse argv[0].
+        
+        * ciao/FTComponentServer/CIAO_FTComponentServer_Impl.cpp:
+        
+          Added CLIENT_PROPAGATED RT ORB policy to the configuration of
+          each container.
+        
+        * ciao/FTComponentServer/CIAO_ComponentServer.mpc
+        * ciao/FTComponentServer/AppMonitor:
+        
+          Removed AppMonitor library and use the original LWFT library instead.
+
+        
 Sat Dec  6 04:36:06 UTC 2008  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
 
         * DAnCE/tests/CIAO/FTClientComponent
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index f3be8606a76..c2f705dc66b 100644
--- a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -91,7 +91,7 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
   ACE_Get_Opt get_opts (argc,
                         argv,
                         "e:n:p::c::r::ifs:t:h",
-                        0,
+                        1,
                         0,
                         ACE_Get_Opt::RETURN_IN_ORDER);
 
diff --git a/CIAO/ciao/FTComponentServer/CIAO_ComponentServer.mpc b/CIAO/ciao/FTComponentServer/CIAO_ComponentServer.mpc
index f0f1c32ae20..bc3fc300825 100644
--- a/CIAO/ciao/FTComponentServer/CIAO_ComponentServer.mpc
+++ b/CIAO/ciao/FTComponentServer/CIAO_ComponentServer.mpc
@@ -75,10 +75,9 @@ project(CIAO_FTComponentServer_svnt) : ccm_componentserver_svnt, ciao_ft_compone
   }
 }
 
-project(CIAO_FTComponentServer_exe) : ccm_componentserver_svnt, portableserver, ciao_ft_componentserver_svnt, messaging, anytypecode, ciao_server, ciaoexe, ciao_session_container, ciao_ft_componentserver_configurator {
+project(CIAO_FTComponentServer_exe) : ccm_componentserver_svnt, portableserver, ciao_ft_componentserver_svnt, messaging, anytypecode, ciao_server, ciaoexe, ciao_session_container, ciao_ft_componentserver_configurator, rtcorba {
   exename = ciao_ft_componentserver
-  libs += CIAO_Logger AppMonitor LWFT_StateSyncAgent LWFT_ReplicationManager LWFT_Client LWFT_Server
-  after += AppMonitor
+  libs += CIAO_Logger LWFT_StateSyncAgent LWFT_ReplicationManager LWFT_Client LWFT_Server
   macros += CIAO_BUILD_COMPONENTSERVER_EXE
   includes += $(TAO_ROOT)/orbsvcs/orbsvcs/LWFT
 
diff --git a/CIAO/ciao/FTComponentServer/CIAO_FTComponentServer_Impl.cpp b/CIAO/ciao/FTComponentServer/CIAO_FTComponentServer_Impl.cpp
index 8f1827c6035..12d62d96410 100644
--- a/CIAO/ciao/FTComponentServer/CIAO_FTComponentServer_Impl.cpp
+++ b/CIAO/ciao/FTComponentServer/CIAO_FTComponentServer_Impl.cpp
@@ -4,6 +4,9 @@
 
 #include "CIAO_CS_ClientC.h"
 #include "CIAO_Container_Impl.h"
+#include "tao/RTCORBA/RTCORBA.h"
+
+const size_t CS_DEFAULT_PRIORITY = 0;
 
 namespace CIAO
 {
@@ -69,7 +72,20 @@ namespace CIAO
           CIAO_DEBUG ((LM_INFO, CLINFO "CIAO_ComponentServer_i::create_container - Request received with %u config values\n",
                        config.length ()));
 	  
-	  CORBA::PolicyList policies;
+          // get RT ORB and set client_propagated priority
+          CORBA::Object_var obj = orb_->resolve_initial_references ("RTORB");
+          RTCORBA::RTORB_var rtorb = RTCORBA::RTORB::_narrow (obj);
+
+	  CORBA::PolicyList policies (1);
+
+          if (!CORBA::is_nil (rtorb))
+            {
+              policies.length (1);
+              policies[0] = RTCORBA::PriorityModelPolicy::_duplicate (rtorb->create_priority_model_policy (
+                              RTCORBA::CLIENT_PROPAGATED,
+                              CS_DEFAULT_PRIORITY));
+            }
+
 	  const char *name = 0;
 
           CIAO_Container_i *cont = 0;