*** empty log message ***

7 files changed, 56 insertions, 13 deletions

diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
index f6c1e5241d5..97585f0d8d1 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
@@ -9,8 +9,7 @@ project (Config_Handlers) : ciao_deployment_stub {
   requires += exceptions
   includes += $(XERCESCROOT)/include 
   libpaths += $(XERCESCROOT)/lib
-  lit_libs += xerces-c
-  libs     += CIAO_DnC_Server TAO_IFR_Client TAO_Valuetype
+  libs     += CIAO_DnC_Server TAO_IFR_Client TAO_Valuetype xerces-c
 
   Source_Files {
     Utils.cpp
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp
index e0f0fc87c36..e5e34367f78 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp
@@ -12,7 +12,7 @@
 
 namespace Deployment
 {
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
+
   /*
    *  Generic dump functions
    */
@@ -1043,7 +1043,7 @@ namespace Deployment
         ACE_THROW (CORBA::INTERNAL ());
       }
   }
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
+//#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
 }
 
 #endif /* DNC_DUMP_C */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
index b20b98469e9..d4dece3f1a5 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
@@ -28,12 +28,12 @@ namespace Deployment
    * @brief This class defines a set of overloaded "dump" methods to print
    * the contents of various IDL data types, which passed as input.
    */
-  class Config_Handler_Export DnC_Dump
+  class /*Config_Handler_Export*/ DnC_Dump
     {
 /*
  *  If the compiler has broken nested templates exclude dumping functionality.
  */
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
+//#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
 
     public:
       /// Dump functions for CORBA sequences
@@ -163,11 +163,11 @@ namespace Deployment
       static void dump (const ::CORBA::Any &any);
       // Helper function to print an Any
 
-#else // ACE_HAS_BROKEN_NESTED_TEMPLATES
-    public:
-      static void dump(const Deployment::DeploymentPlan &plan) { }
+//#else // ACE_HAS_BROKEN_NESTED_TEMPLATES
+//    public:
+//      static void dump(const Deployment::DeploymentPlan &plan) { }
 
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
+//#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
     };
 }
 
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
index 620328af617..69243aa08c3 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
@@ -1,6 +1,7 @@
 //$Id$
 
 #include "NodeApplication_Impl.h"
+#include "ace/UUID.h"
 
 #if !defined (__ACE_INLINE__)
 # include "NodeApplication_Impl.inl"
@@ -239,6 +240,14 @@ CIAO::NodeApplication_Impl::install (
          comp = kh->create_component (ACE_ENV_SINGLE_ARG_PARAMETER);
          ACE_TRY_CHECK;
 
+         /*
+         // @@ Set up a component_UUID for this component
+         ACE_Utils::UUID_Generator uuid_gen;
+         ACE_Utils::UUID * p_uuid = uuid_gen.generateUUID ();
+         comp->component_UUID (p_uuid->to_string ()->c_str ());
+         */
+
+
          if (this->component_map_.bind (impl_infos[i].component_instance_name.in (),
                                         Components::CCMObject::_duplicate (comp.in ())))
            ACE_TRY_THROW (Deployment::InstallationFailure ());
@@ -624,7 +633,8 @@ CIAO::NodeApplication_Impl::build_event_connection (const Deployment::Connection
       }
     
     // supplier ID
-    ACE_CString sid = source_objref->component_UUID (ACE_ENV_SINGLE_ARG_DECL);
+    //ACE_CString sid = source_objref->component_UUID (ACE_ENV_SINGLE_ARG_DECL);
+    ACE_CString sid = supplier_comp_name;
     ACE_CHECK;
 
     sid += "_";
@@ -632,7 +642,8 @@ CIAO::NodeApplication_Impl::build_event_connection (const Deployment::Connection
     sid += "_publisher";
 
     // consumer ID
-    ACE_CString cid = sink_objref->component_UUID (ACE_ENV_SINGLE_ARG_DECL);
+    //ACE_CString cid = sink_objref->component_UUID (ACE_ENV_SINGLE_ARG_DECL);
+    ACE_CString cid = consumer_comp_name;
     ACE_CHECK;
 
     cid += "_";
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
index fccbf855572..9b2cbff0a85 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
@@ -16,6 +16,24 @@ namespace CIAO
   }
 
   // Operations for CCMObject interface.
+  /*
+    void
+    Servant_Impl_Base::component_UUID (
+    const char * new_component_UUID
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      this->component_UUID_ = new_component_UUID;
+    }
+
+    CIAO::CONNECTION_ID
+    Servant_Impl_Base::component_UUID (
+    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return CORBA::string_dup (this->component_UUID_.c_str ());
+    }
+  */
 
   ::Components::PrimaryKeyBase *
   Servant_Impl_Base::get_primary_key (
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
index 272fa8f3d5a..cf159fe5ec8 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
@@ -29,6 +29,8 @@
 #include "CIAO_Server_Export.h"
 #include "CCM_ComponentS.h"
 
+#include "CIAO_EventsC.h"
+
 namespace CIAO
 {
   class Session_Container;
@@ -50,7 +52,18 @@ namespace CIAO
     virtual ~Servant_Impl_Base (void);
 
     /// Operations for CCMObject interface.
+/*
+      virtual void
+      component_UUID (
+      const char * new_component_UUID
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
+      virtual CIAO::CONNECTION_ID
+      component_UUID (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+*/
     virtual ::Components::PrimaryKeyBase *
     get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
@@ -204,6 +217,8 @@ namespace CIAO
     FacetTable facet_table_;
     ConsumerTable consumer_table_;
     Session_Container * container_;
+
+    // ACE_CString component_UUID_;
   };
 }
 
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/HUDisplay.cdp b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/HUDisplay.cdp
index 8a1f4ab109f..41761a2e15b 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/HUDisplay.cdp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/HUDisplay.cdp
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Deployment:DeploymentPlan
  xmlns:Deployment="http://www.omg.org/Deployment"
  xmlns:xmi="http://www.omg.org/XMI"