*** empty log message ***CIAO_ReDAC_01

5 files changed, 30 insertions, 5 deletions

diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index e0729d02c64..b3efd7aa40a 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -63,6 +63,8 @@ namespace CIAO
   {
   public:
     /// Default constructor.
+NodeApplication_Impl(void);
+
     NodeApplication_Impl (CORBA::ORB_ptr o,
                           PortableServer::POA_ptr p,
                           NodeApp_Configurator &c,
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
index 5b3a3322443..4977290d355 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
@@ -1,6 +1,9 @@
 /* -*- C++ -*- */
 // $Id$
 
+
+#include "Configurator_Factory.h"
+
 ACE_INLINE
 CIAO::NodeApplication_Impl::
 NodeApplication_Impl (CORBA::ORB_ptr o,
@@ -14,6 +17,16 @@ NodeApplication_Impl (CORBA::ORB_ptr o,
 {
 }
 
+ACE_INLINE
+CIAO::NodeApplication_Impl::
+NodeApplication_Impl ()
+  : orb_ (0),
+    poa_ (0),
+    configurator_ (CIAO::NoOp_Configurator ()),
+    static_entrypts_maps_ (0)
+{
+}
+
 // Access the readonly attribute
 ACE_INLINE
 Deployment::Properties *
diff --git a/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp b/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
index ff2e794b0bc..f4b8fb42171 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
@@ -366,7 +366,7 @@ CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name
     }
 
 
-  ACE_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::find_policies_by_name: %s\n",
+  ACE_DEBUG ((LM_DEBUG, "RTResource_Config_Manager::find_policies_by_name: %s\n",
               name));
               
   POLICY_MAP::ENTRY *entry = 0;
diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp
index a71a555f673..408cfe590fd 100644
--- a/TAO/CIAO/ciao/Container_Base.cpp
+++ b/TAO/CIAO/ciao/Container_Base.cpp
@@ -624,7 +624,7 @@ namespace CIAO
 
     if (t == Container::Facet_Consumer)
     {
-      if (CIAO::debug_level () > 1)
+      if (CIAO::debug_level () > 9)
         ACE_DEBUG ((LM_DEBUG, "STRING in container is %s\n",
                     str.in ()));
     }
diff --git a/TAO/CIAO/ciao/Deployment_Core.idl b/TAO/CIAO/ciao/Deployment_Core.idl
index 30a42bc1e57..98fd140ff91 100644
--- a/TAO/CIAO/ciao/Deployment_Core.idl
+++ b/TAO/CIAO/ciao/Deployment_Core.idl
@@ -20,8 +20,6 @@ module Deployment
   exception InvalidLocation {};
   exception InstallationFailure 
   {
-    /*Do we still need a reason? --Tao
-     *Yes -- will */
     string name;
     string reason;
   };
@@ -71,7 +69,16 @@ module Deployment
     MultiplexReceptacle,
     EventEmitter,
     EventPublisher,
-    EventConsumer
+    EventConsumer,
+	ecEventEmitter,
+    ecEventPublisher,
+    ecEventConsumer,
+    rtecEventEmitter,
+    rtecEventPublisher,
+    rtecEventConsumer,
+    nsEventEmitter,
+    nsEventPublisher,
+    nsEventConsumer
   };
 
   // To avoid the connection info in the plan being passed to the
@@ -83,6 +90,9 @@ module Deployment
     string portName;
     CCMComponentPortKind kind;
 
+    string endpointInstanceName; // CIAO specific extension 
+    string endpointPortName;     // CIAO specific extension
+
     // the endpoints member is change to endpoint.
     // Since we will not have more than 1 objref in there.
     Object endpoint;