Wed Nov 4 06:48:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/ComponentServer/CIAO_ComponentServer.mpc:
          Suppress skeleton files

        * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp:
        * ciao/ComponentServer/Configurators/Basic_Config_Manager.h:
        * ciao/ComponentServer/Configurators/Config_Manager.h:
          Layout changes

        * ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp:
          Initialise pointer with 0

        * ciao/ComponentServer/Configurators/RT/RT_Configurator.mpc:
          New file

7 files changed, 49 insertions, 23 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 439bccfb6b7..02d14fc568b 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,8 +1,24 @@
+Wed Nov  4 06:48:31 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/ComponentServer/CIAO_ComponentServer.mpc:
+          Suppress skeleton files
+
+        * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp:
+        * ciao/ComponentServer/Configurators/Basic_Config_Manager.h:
+        * ciao/ComponentServer/Configurators/Config_Manager.h:
+          Layout changes
+
+        * ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp:
+          Initialise pointer with 0
+
+        * ciao/ComponentServer/Configurators/RT/RT_Configurator.mpc:
+          New file
+
 Tue Nov  3 17:46:17 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tests/IDL_Test/Cornucopia/Cornucopia.idl:
         * tests/IDL_Test/Keywords/Keyword_Clash.idl:
-        
+
           Updated test IDL to included IDL3+ cases, sent by
           Johnny Willemsen <jwillemsen at remedy dot nl>.
 
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
index e2373c9d301..1ae14a3224f 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
@@ -22,8 +22,11 @@ project(CIAO_CS_Client_IDL) : ciaoidldefaults, anytypecode {
   custom_only=1
 
   IDL_Files {
-    CIAO_CS_Client.idl
     CIAO_Properties.idl
+    idlflags += -SS
+  }
+  IDL_Files {
+    CIAO_CS_Client.idl
   }
 }
 
diff --git a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp b/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp
index ecd2c0003cc..f28ded4c372 100755
--- a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp
+++ b/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp
@@ -12,7 +12,6 @@ namespace CIAO
 {
   namespace Deployment
   {
-
     void
     Basic_Config_Manager::init (CORBA::ORB_ptr orb)
     {
@@ -83,7 +82,7 @@ namespace CIAO
                                           policy_list) != 0)
                 {
                   CIAO_ERROR ((LM_ERROR,
-            "Error binding Policy_Set with name: %C\n",
+                              "Error binding Policy_Set with name: %C\n",
                               sets[i].Id.in ()));
                   throw CORBA::INTERNAL ();
                 }
@@ -91,7 +90,7 @@ namespace CIAO
                 {
                   CIAO_DEBUG ((LM_DEBUG,
                               "Basic_Config_Manager::init_resource"
-            " added policy set : %C with %d policies\n",
+                              " added policy set : %C with %d policies\n",
                               sets[i].Id.in (), array_index));
                 }
             }
@@ -99,7 +98,7 @@ namespace CIAO
             {
               CIAO_DEBUG ((LM_DEBUG,
                           "Basic_Config_Manager::init_resource"
-        " added policy set : %C with %d policies\n",
+                          " added policy set : %C with %d policies\n",
                           sets[i].Id.in (), array_index));
             }
         }
diff --git a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h b/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h
index e599cc7eb04..2a610f0b937 100755
--- a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h
+++ b/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h
@@ -26,7 +26,7 @@
 #include "ciao/ComponentServer/CIAO_ServerResourcesC.h"
 
 #include "Config_Manager.h"
-#include "Basic_Config_Manager_export.h" 
+#include "Basic_Config_Manager_export.h"
 
 namespace CIAO
 {
@@ -34,7 +34,7 @@ namespace CIAO
   {
     /**
      */
-    class Basic_Config_Manager_Export Basic_Config_Manager 
+    class Basic_Config_Manager_Export Basic_Config_Manager
       : public Config_Manager
     {
     public:
@@ -58,8 +58,7 @@ namespace CIAO
       /// Cached an ORB reference.
       CORBA::ORB_var orb_;
 
-      CORBA::Policy_ptr create_single_policy
-        (const PolicyDef &policy_def);
+      CORBA::Policy_ptr create_single_policy (const PolicyDef &policy_def);
 
       /// Hash_Map stuff.
       typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
@@ -68,11 +67,11 @@ namespace CIAO
         ACE_Equal_To<ACE_CString>,
         ACE_Null_Mutex> POLICY_MAP;
 
-    /// Internal TP names to id map.
-    POLICY_MAP policy_map_;
-  };
-}
+        /// Internal TP names to id map.
+        POLICY_MAP policy_map_;
+    };
   }
+}
 
 #include /**/ "ace/post.h"
 #endif /* CIAO_NACONFIG_MANAGER_H */
diff --git a/CIAO/ciao/ComponentServer/Configurators/Config_Manager.h b/CIAO/ciao/ComponentServer/Configurators/Config_Manager.h
index 2ce46aa980f..762f605a8c4 100755
--- a/CIAO/ciao/ComponentServer/Configurators/Config_Manager.h
+++ b/CIAO/ciao/ComponentServer/Configurators/Config_Manager.h
@@ -5,11 +5,9 @@
  *  @file    Config_Manager.h
  *
  *  $Id$
- *
  */
 //=============================================================================
 
-
 #ifndef CIAO_CONFIG_MANAGER_H
 #define CIAO_CONFIG_MANAGER_H
 #include /**/ "ace/pre.h"
@@ -32,17 +30,17 @@ namespace CIAO
     {
     public:
       virtual ~Config_Manager (void) {};
-      
+
       virtual int pre_orb_initialize (void) = 0;
-      
+
       virtual int post_orb_initialize (CORBA::ORB_ptr o) = 0;
-      
+
       virtual void init_resources (const ServerResource &info) = 0;
-      
+
       virtual void init (CORBA::ORB_ptr orb) = 0;
-      
+
       virtual CORBA::PolicyList *find_policies_by_name (const char *name)= 0;
-      
+
       virtual bool policy_exists (const char *name) = 0;
     };
   }
diff --git a/CIAO/ciao/ComponentServer/Configurators/RT/RT_Configurator.mpc b/CIAO/ciao/ComponentServer/Configurators/RT/RT_Configurator.mpc
new file mode 100644
index 00000000000..59722cf7d90
--- /dev/null
+++ b/CIAO/ciao/ComponentServer/Configurators/RT/RT_Configurator.mpc
@@ -0,0 +1,11 @@
+// $Id$
+project(RT_Configurator) : ccm_stub, ciao_componentserver_stub, ciao_lib  {
+  after += CIAO_Basic_Configurator
+  libs += CIAO_Basic_Configurator
+  dynamicflags = CIAO_RTNA_CONFIGURATOR_BUILD_DLL
+  Source_Files {
+    RTConfig_Manager.cpp
+  }
+}
+
+
diff --git a/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp b/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp
index 91e8a3b3f36..a6a46853fdf 100644
--- a/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp
+++ b/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp
@@ -51,7 +51,7 @@ CIAO::RTNodeApp_Configurator::init_resource_manager
 
       if (ACE_OS::strcmp ("CIAOServerResources", properties[i].name.in ()) == 0)
         {
-          const CIAO::DAnCE::ServerResource *svr_resource;
+          const CIAO::DAnCE::ServerResource *svr_resource = 0;
           if (properties[i].value >>= svr_resource)
             {
               this->config_manager_.init_resources (*svr_resource);