*** empty log message ***

10 files changed, 28 insertions, 18 deletions

diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp
index d37f153e129..aca1b5c6cb9 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp
@@ -163,6 +163,7 @@ namespace BMClosedED_Impl
       ACE_CHECK;
       my_uuid += "_prepare_capture_publisher";
 
+      ACE_DEBUG ((LM_DEBUG, "======== connection_uuid is: %s =============\n", my_uuid.c_str ()));
       this->container_->push_event (ev,
                                     my_uuid.c_str ()
                                     ACE_ENV_ARG_PARAMETER);
@@ -260,6 +261,7 @@ namespace BMClosedED_Impl
 
   namespace CIAO_GLUE_BasicSP
   {
+    /*
     void
     BMClosedED_Servant::component_UUID (
     const char * new_component_UUID
@@ -276,7 +278,7 @@ namespace BMClosedED_Impl
     {
       return CORBA::string_dup (this->component_UUID_.c_str ());
     }
-
+*/
  
     BMClosedED_Servant::BMClosedED_Servant (
     ::BasicSP::CCM_BMClosedED_ptr exe,
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h
index 335a8e51632..68835a085c4 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h
@@ -207,6 +207,7 @@ namespace BMClosedED_Impl
       ACE_ENV_ARG_DECL);
 
       // Supported operations.
+      /*
       virtual void
       component_UUID (
       const char * new_component_UUID
@@ -217,7 +218,7 @@ namespace BMClosedED_Impl
       component_UUID (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+*/
       // Public port operations.
 
       virtual ::BasicSP::ReadData_ptr
@@ -384,7 +385,7 @@ namespace BMClosedED_Impl
       ::BasicSP::DataAvailableConsumer_var
       consumes_in_avail_;
 
-      ACE_CString component_UUID_;
+      //ACE_CString component_UUID_;
 
       private:
 
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.cpp
index 5392a96a84b..d5f603aec91 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.cpp
@@ -109,11 +109,11 @@ namespace BMDevice_Impl
     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
-
       ACE_CString my_uuid = this->servant_->component_UUID (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      my_uuid += "_prepare_capture_publisher";
+      my_uuid += "_data_available_publisher";
 
+      ACE_DEBUG ((LM_DEBUG, "======== connection_uuid is: %s =============\n", my_uuid.c_str ()));
       this->container_->push_event (ev,
                                     my_uuid.c_str ()
                                     ACE_ENV_ARG_PARAMETER);
@@ -211,6 +211,7 @@ namespace BMDevice_Impl
 
   namespace CIAO_GLUE_BasicSP
   {
+    /*
     void
     BMDevice_Servant::component_UUID (
     const char * new_component_UUID
@@ -227,7 +228,7 @@ namespace BMDevice_Impl
     {
       return CORBA::string_dup (this->component_UUID_.c_str ());
     }
-
+*/
     BMDevice_Servant::BMDevice_Servant (
     ::BasicSP::CCM_BMDevice_ptr exe,
     ::Components::CCMHome_ptr h,
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h
index d7b2702ea5f..5dffd60fe0c 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h
@@ -182,6 +182,7 @@ namespace BMDevice_Impl
       ACE_ENV_ARG_DECL);
 
       // Supported operations.
+      /*
       virtual void
       component_UUID (
       const char * new_component_UUID
@@ -192,7 +193,7 @@ namespace BMDevice_Impl
       component_UUID (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+*/
       // Public port operations.
 
       virtual ::BasicSP::ReadData_ptr
@@ -338,7 +339,7 @@ namespace BMDevice_Impl
       ::BasicSP::TimeOutConsumer_var
       consumes_timeout_;
 
-      ACE_CString component_UUID_;
+      //ACE_CString component_UUID_;
 
       private:
 
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.cpp
index a7929e736b4..2304d6526e6 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.cpp
@@ -105,6 +105,7 @@ namespace BMDisplay_Impl
 
   namespace CIAO_GLUE_BasicSP
   {
+    /*
     void
     BMDisplay_Servant::component_UUID (
     const char * new_component_UUID
@@ -121,7 +122,7 @@ namespace BMDisplay_Impl
     {
       return CORBA::string_dup (this->component_UUID_.c_str ());
     }
-
+*/
  
     BMDisplay_Servant::BMDisplay_Servant (
     ::BasicSP::CCM_BMDisplay_ptr exe,
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h
index 16b3c2dfe2f..dfb5678175e 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h
@@ -143,6 +143,7 @@ namespace BMDisplay_Impl
       ACE_ENV_ARG_DECL);
 
       // Supported operations.
+      /*
       virtual void
       component_UUID (
       const char * new_component_UUID
@@ -153,7 +154,7 @@ namespace BMDisplay_Impl
       component_UUID (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+*/
       // Public port operations.
 
       // Servant class for the data_ready consumer.
@@ -296,7 +297,7 @@ namespace BMDisplay_Impl
       ::BasicSP::DataAvailableConsumer_var
       consumes_data_ready_;
 
-      ACE_CString component_UUID_;
+      //ACE_CString component_UUID_;
 
       private:
 
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp
index e78f7f1157e..d89a784af8a 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp
@@ -52,8 +52,9 @@ namespace EC_Impl
 
       ACE_CString my_uuid = this->servant_->component_UUID (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      my_uuid += "_prepare_capture_publisher";
+      my_uuid += "_timeout_publisher";
 
+      ACE_DEBUG ((LM_DEBUG, "======== connection_uuid is: %s =============\n", my_uuid.c_str ()));
       this->container_->push_event (ev,
                                     my_uuid.c_str ()
                                     ACE_ENV_ARG_PARAMETER);
@@ -151,6 +152,7 @@ namespace EC_Impl
 
   namespace CIAO_GLUE_BasicSP
   {
+    /*
     void
     EC_Servant::component_UUID (
     const char * new_component_UUID
@@ -167,7 +169,7 @@ namespace EC_Impl
     {
       return CORBA::string_dup (this->component_UUID_.c_str ());
     }
-
+*/
  
     EC_Servant::EC_Servant (
     ::BasicSP::CCM_EC_ptr exe,
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h
index 3db4ddf95fa..a2979d92a32 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h
@@ -144,6 +144,7 @@ namespace EC_Impl
       ACE_ENV_ARG_DECL);
 
       // Supported operations.
+      /*
       virtual void
       component_UUID (
       const char * new_component_UUID
@@ -154,7 +155,7 @@ namespace EC_Impl
       component_UUID (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+*/
       virtual void
       start (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
@@ -262,7 +263,7 @@ namespace EC_Impl
       ::CORBA::SystemException));
 
       private:
-      ACE_CString component_UUID_;
+      //ACE_CString component_UUID_;
 
       private:
 
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/GPS.ccd b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/GPS.ccd
index a0eddcb4f94..35ad0b4c653 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/GPS.ccd
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/GPS.ccd
@@ -27,7 +27,7 @@
     <provider>true</provider>
     <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
     <specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
-    <kind>EventPublisher</kind>
+    <kind>rtecEventPublisher</kind>
   </port>
 
   <port>
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/Timer.ccd b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/Timer.ccd
index ba44bcf1a00..70351eba101 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/Timer.ccd
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/Timer.ccd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Deployment:ComponentInterfaceDescription
  xmlns:Deployment="http://www.omg.org/Deployment"
  xmlns:xmi="http://www.omg.org/XMI"
@@ -32,7 +32,7 @@
     <provider>true</provider>
     <supportedType>IDL:BasicSP/TimeOut:1.0</supportedType>
     <specificType>IDL:BasicSP/TimeOut:1.0</specificType>
-    <kind>EventPublisher</kind>
+    <kind>rtecEventPublisher</kind>
   </port>
 
 </Deployment:ComponentInterfaceDescription>