Sun Aug 29 15:34:43 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

        * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp:
        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
        * DAnCE/NodeManager/NodeManager_Impl.cpp:

          Bugfixes for localityconfiguration command line option.

        * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp:
        * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc:

          Bugfixes.

        * examples/Hello/descriptors/run_test_shs.pl:
        * examples/Hello/descriptors/shs.localityconfig:

          Modified test to load SHS interceptor from localityconfig file.

8 files changed, 71 insertions, 35 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 27e5e8799e0..f69f423baba 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,21 @@
+Sun Aug 29 15:34:43 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+
+          Bugfixes for localityconfiguration command line option.
+
+        * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp:
+        * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc:
+
+          Bugfixes.
+
+        * examples/Hello/descriptors/run_test_shs.pl:
+        * examples/Hello/descriptors/shs.localityconfig:
+
+          Modified test to load SHS interceptor from localityconfig file.
+
 Sat Aug 28 21:03:06 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/DAnCE/DAnCE_Properties.idl:
diff --git a/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp b/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp
index 49c0584fb69..a32f1181de6 100644
--- a/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp
+++ b/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp
@@ -327,35 +327,7 @@ namespace DAnCE
                            ACE_TEXT ("DAnCE_LocalityActivator_i::construct_command_line - ")
                            ACE_TEXT ("Adding provided locality configuration file %C\n"), args));
 
-          cmd_options += ' ';
-          cmd_options += args;
-          cmd_options += ' ';
-        }
-
-      if (server.cmap_->find (DAnCE::DANCE_LM_CONFIGFILE, val) == 0)
-        {
-          const char *args = 0;
-          val >>= args;
-
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO
-                           ACE_TEXT ("DAnCE_LocalityActivator_i::construct_command_line - ")
-                           ACE_TEXT ("Adding provided locality configuration file %C\n"), args));
-
-          cmd_options += ' ';
-          cmd_options += args;
-          cmd_options += ' ';
-        }
-
-      if (server.cmap_->find (DAnCE::DANCE_LM_CONFIGFILE, val) == 0)
-        {
-          const char *args = 0;
-          val >>= args;
-
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO
-                           ACE_TEXT ("DAnCE_LocalityActivator_i::construct_command_line - ")
-                           ACE_TEXT ("Adding provided locality configuration file %C\n"), args));
-
-          cmd_options += ' ';
+          cmd_options += " --plugin-config ";
           cmd_options += args;
           cmd_options += ' ';
         }
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 9d76f33dd6d..3fbca976327 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -248,8 +248,19 @@ NodeApplicationManager_Impl::preparePlan (const Deployment::DeploymentPlan& plan
                                                  new_path.c_str ());
 #endif
         }
-
-      // Need to add naming service reference to config properties.
+      
+      const char *config_file;
+      
+      if (DAnCE::Utility::get_property_value (DAnCE::DANCE_LM_CONFIGFILE,
+                                              this->properties_,
+                                              config_file))
+        {
+          DAnCE::Utility::update_property_value<const char *> (DAnCE::DANCE_LM_CONFIGFILE,
+                                                               lm_idd.configProperty,
+                                                               config_file);
+        }
+      
+      
       DAnCE::Utility::update_property_value<CosNaming::NamingContext_ptr> (
             DAnCE::LOCALITY_NAMINGCONTEXT,
             lm_idd.configProperty,
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index e99e09d5a6c..253a63fd739 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -41,6 +41,8 @@ namespace DAnCE
     ::Deployment::Properties prop;
     ::DAnCE::Utility::build_property_sequence (prop, properties);
     PLUGIN_MANAGER::instance ()->set_configuration (prop);
+    PLUGIN_MANAGER::instance ()->set_orb (this->orb_);
+    
     Plugin_Manager::IH_DEPS deps;
     CORBA::String_var safe_type =
       PLUGIN_MANAGER::instance ()->register_installation_handler (ACE_TEXT_CHAR_TO_TCHAR ("DAnCE_Locality_Handler"),
diff --git a/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp b/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
index e1ea8c7e32c..f648259581f 100644
--- a/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
+++ b/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
@@ -4,6 +4,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "DAnCE/DAnCE_PropertiesC.h"
 #include "DAnCE/Logger/Log_Macros.h"
+#include "LocalityManager/Scheduler/Plugin_Manager.h"
 
 namespace DAnCE
 {
@@ -24,15 +25,40 @@ namespace DAnCE
 
       for (CORBA::ULong i = 0; i < props.length (); ++i)
         {
+	  DANCE_DEBUG (10, (LM_TRACE, DLINFO
+			    ACE_TEXT ("SHS_CORBA_Transport::configure - ")
+			    ACE_TEXT ("Considering property <%C>\n"),
+			    props[i].name.in ()));
+
           if ((ACE_OS::strcmp (props[i].name.in (),
                               DAnCE::LOCALITY_NAMINGCONTEXT) == 0) ||
               (ACE_OS::strcmp (props[i].name.in (),
                                DAnCE::INSTANCE_NC) == 0))
             {
+	      DANCE_DEBUG (7, (LM_DEBUG, DLINFO
+			       ACE_TEXT ("SHS_CORBA_Transport::configure - ")
+			       ACE_TEXT ("Found property <%C>\n"),
+			       props[i].name.in ()));
+              
               CORBA::Object_var obj;
-              props[i].value >>= CORBA::Any::to_object (obj);
               
-              CORBA::is_nil (obj);
+              if (!(props[i].value >>= CORBA::Any::to_object (obj)))
+                {
+                  const char *val;
+                  props[i].value >>= CORBA::Any::to_string (val, 0);
+                  
+                  CORBA::ORB_var orb = PLUGIN_MANAGER::instance ()->get_orb ();
+                  obj = orb->string_to_object (val);
+                }
+              
+              if (CORBA::is_nil (obj))
+		{
+		  DANCE_ERROR (3, (LM_NOTICE, DLINFO
+				   ACE_TEXT ("Unable to extract an object reference from ")
+				   ACE_TEXT ("property <%C>\n"),
+				   props[i].name.in ()));
+		  return;
+		}
                 
               ctx = CosNaming::NamingContext::_narrow (obj.in ());
               break;
diff --git a/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc b/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc
index d234e421abc..b8a0c931694 100644
--- a/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc
+++ b/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project (DAnCE_SHS_CORBA_Transport) : dance_lib, dance_output, dance_logger, \
-        dance_shs_daemon, naming {
+        dance_shs_daemon, naming, dance_deployment_scheduler {
   
    dynamicflags += DANCE_SHS_CORBA_TRANSPORT_BUILD_DLL
 
diff --git a/CIAO/examples/Hello/descriptors/run_test_shs.pl b/CIAO/examples/Hello/descriptors/run_test_shs.pl
index 0d714d40c3a..9dedca9c3dc 100755
--- a/CIAO/examples/Hello/descriptors/run_test_shs.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_shs.pl
@@ -133,7 +133,7 @@ sub run_node_daemons {
         $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --instance-nc corbaloc:rir:/NameService";
+        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --instance-nc corbaloc:rir:/NameService --locality-config shs.localityconfig";
 
         print "Run dance_node_manager with $d_param\n";
 
diff --git a/CIAO/examples/Hello/descriptors/shs.localityconfig b/CIAO/examples/Hello/descriptors/shs.localityconfig
new file mode 100644
index 00000000000..dd6ba826aba
--- /dev/null
+++ b/CIAO/examples/Hello/descriptors/shs.localityconfig
@@ -0,0 +1,7 @@
+edu.vanderbilt.dre.DAnCE.InstanceHandler CIAO_Deployment_Handlers create_Container_Handler
+edu.vanderbilt.dre.DAnCE.InstanceHandler CIAO_Deployment_Handlers create_Home_Handler
+edu.vanderbilt.dre.DAnCE.InstanceHandler CIAO_Deployment_Handlers create_Component_Handler
+edu.vanderbilt.dre.DAnCE.InstanceHandler CIAO_Deployment_Handlers create_Homed_Component_Handler
+edu.vanderbilt.dre.DAnCE.DeploymentInterceptor CIAO_Deployment_Interceptors create_CIAO_StoreReferences
+edu.vanderbilt.dre.DAnCE.DeploymentInterceptor DAnCE_SHS_Interceptors create_DAnCE_SHS_Interceptor
+edu.vanderbilt.dre.DAnCE.DeploymentInterceptor DAnCE_Error_Interceptors create_DAnCE_Standard_Error