*** empty log message ***

4 files changed, 85 insertions, 59 deletions

diff --git a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
index 111232c6a4e..d3cc2577aa2 100644
--- a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
@@ -4963,6 +4963,8 @@ namespace CIAO
       else if (v == "EventEmitter") v_ = EventEmitter_l;
       else if (v == "EventPublisher") v_ = EventPublisher_l;
       else if (v == "EventConsumer") v_ = EventConsumer_l;
+      else if (v == "rtecEventPublisher") v_ = rtecEventPublisher_l;
+      else if (v == "rtecEventConsumer") v_ = rtecEventConsumer_l;
       else 
       {
       }
@@ -4980,6 +4982,8 @@ namespace CIAO
       else if (v == "EventEmitter") v_ = EventEmitter_l;
       else if (v == "EventPublisher") v_ = EventPublisher_l;
       else if (v == "EventConsumer") v_ = EventConsumer_l;
+      else if (v == "rtecEventPublisher") v_ = rtecEventPublisher_l;
+      else if (v == "rtecEventConsumer") v_ = rtecEventConsumer_l;
       else 
       {
       }
@@ -4991,6 +4995,8 @@ namespace CIAO
     CCMComponentPortKind const CCMComponentPortKind::EventEmitter (CCMComponentPortKind::EventEmitter_l);
     CCMComponentPortKind const CCMComponentPortKind::EventPublisher (CCMComponentPortKind::EventPublisher_l);
     CCMComponentPortKind const CCMComponentPortKind::EventConsumer (CCMComponentPortKind::EventConsumer_l);
+    CCMComponentPortKind const CCMComponentPortKind::rtecEventPublisher (CCMComponentPortKind::rtecEventPublisher_l);
+    CCMComponentPortKind const CCMComponentPortKind::rtecEventConsumer (CCMComponentPortKind::rtecEventConsumer_l);
 
     // ComponentPortDescription
     //
@@ -12187,6 +12193,8 @@ namespace CIAO
         else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventEmitter) s = "EventEmitter";
         else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventPublisher) s = "EventPublisher";
         else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventConsumer) s = "EventConsumer";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::rtecEventPublisher) s = "rtecEventPublisher";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::rtecEventConsumer) s = "rtecEventConsumer";
         else 
         {
         }
diff --git a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
index abde5866a0d..6956a776a9d 100644
--- a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -116,7 +116,7 @@ namespace CIAO
 
       enum Value
       {
-        tk_null_l,tk_void_l,tk_short_l,tk_long_l,tk_ushort_l,tk_ulong_l,tk_float_l,tk_double_l,tk_boolean_l,tk_char_l,tk_octet_l,tk_any_l,tk_TypeCode_l,tk_Principal_l,tk_objref_l,tk_struct_l,tk_union_l,tk_enum_l,tk_string_l,tk_sequence_l,tk_array_l,tk_alias_l,tk_except_l,tk_longlong_l,tk_ulonglong_l,tk_longdouble_l,tk_wchar_l,tk_wstring_l,tk_wfixed_l,tk_value_l,tk_value_box_l,tk_native_l,tk_abstract_interface_l,tk_local_interface_l,tk_component_l,tk_home_l,tk_event_l
+        tk_null_l,tk_void_l,tk_short_l,tk_long_l,tk_ushort_l,tk_ulong_l,tk_float_l,tk_double_l,tk_boolean_l,tk_char_l,tk_octet_l,tk_any_l,tk_TypeCode_l,tk_Principal_l,tk_objref_l,tk_struct_l,tk_union_l,tk_enum_l,tk_string_l,tk_sequence_l,tk_array_l,tk_alias_l,tk_except_l,tk_longlong_l,tk_ulonglong_l,tk_longdouble_l,tk_wchar_l,tk_wstring_l,tk_wfixed_l,tk_value_l,tk_value_box_l,tk_native_l,tk_abstract_interface_l,tk_local_interface_l,tk_component_l,tk_home_l,tk_event_l,
       };
 
 
@@ -536,7 +536,7 @@ namespace CIAO
 
       enum Value
       {
-        Quantity_l,Capacity_l,Minimum_l,Maximum_l,Attribute_l,Selection_l
+        Quantity_l,Capacity_l,Minimum_l,Maximum_l,Attribute_l,Selection_l,
       };
 
 
@@ -999,7 +999,7 @@ namespace CIAO
 
       enum Value
       {
-        None_l,InstanceUsesResource_l,ResourceUsesInstance_l,PortUsesResource_l,ResourceUsesPort_l
+        None_l,InstanceUsesResource_l,ResourceUsesInstance_l,PortUsesResource_l,ResourceUsesPort_l,
       };
 
 
@@ -1197,10 +1197,12 @@ namespace CIAO
       static CCMComponentPortKind const EventEmitter;
       static CCMComponentPortKind const EventPublisher;
       static CCMComponentPortKind const EventConsumer;
+      static CCMComponentPortKind const rtecEventPublisher;
+      static CCMComponentPortKind const rtecEventConsumer;
 
       enum Value
       {
-        Facet_l,SimplexReceptacle_l,MultiplexReceptacle_l,EventEmitter_l,EventPublisher_l,EventConsumer_l
+        Facet_l,SimplexReceptacle_l,MultiplexReceptacle_l,EventEmitter_l,EventPublisher_l,EventConsumer_l,rtecEventPublisher_l,rtecEventConsumer_l,
       };
 
 
@@ -4038,7 +4040,7 @@ namespace CIAO
       {
         TCKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
@@ -4711,7 +4713,7 @@ namespace CIAO
       {
         SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
@@ -5383,7 +5385,7 @@ namespace CIAO
       {
         ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
@@ -5597,7 +5599,7 @@ namespace CIAO
       {
         CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index e9667484d0b..2d480e2b360 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -26,46 +26,54 @@ namespace CIAO
           toconfig.supportedType[0] =
             desc.supportedType ().c_str ();
         }
-      
+
       switch (desc.kind ().integral ())
         {
         case CCMComponentPortKind::Facet_l:
           toconfig.kind = Deployment::Facet;
           break;
-          
+
         case CCMComponentPortKind::SimplexReceptacle_l:
           toconfig.kind = Deployment::SimplexReceptacle;
           break;
-          
+
         case CCMComponentPortKind::MultiplexReceptacle_l:
           toconfig.kind = Deployment::MultiplexReceptacle;
           break;
-          
+
         case CCMComponentPortKind::EventEmitter_l:
           toconfig.kind = Deployment::EventEmitter;
           break;
-          
+
         case CCMComponentPortKind::EventPublisher_l:
           toconfig.kind = Deployment::EventPublisher;
           break;
-          
+
         case CCMComponentPortKind::EventConsumer_l:
-          toconfig.kind = Deployment::EventConsumer; 
+          toconfig.kind = Deployment::EventConsumer;
+          break;
+
+        case CCMComponentPortKind::rtecEventPublisher_l:
+          toconfig.kind = Deployment::rtecEventPublisher;
+          break;
+
+        case CCMComponentPortKind::rtecEventConsumer_l:
+          toconfig.kind = Deployment::rtecEventConsumer;
           break;
-          
+
         default:
           ACE_ERROR ((LM_ERROR, "Invalid port type in connection %s\n",
                       desc.name ().c_str ()));
           throw 1;
         }
-      
+
       /* @@BUG: We need to consider how to handle booleans. */
       toconfig.provider = desc.provider () == "true";
       toconfig.exclusiveProvider = desc.exclusiveProvider () == "true";
       toconfig.exclusiveUser = desc.exclusiveUser () == "true";
       toconfig.optional =  desc.optional () == "true";
     }
-    
+
     ComponentPortDescription
     CPD_Handler::component_port_description (
       const Deployment::ComponentPortDescription& src)
@@ -73,34 +81,34 @@ namespace CIAO
       CIAO_TRACE("CPD_Handler::component_port_description - reverse");
       ::XMLSchema::string< char > name ((src.name));
       ::XMLSchema::string< char > stype ((src.specificType));
-     
-      ::XMLSchema::string< char > tval ("true"); 
-      ::XMLSchema::string< char > fval ("false"); 
+
+      ::XMLSchema::string< char > tval ("true");
+      ::XMLSchema::string< char > fval ("false");
       ::XMLSchema::string< char > provider ("");
       ::XMLSchema::string< char > exclusiveProvider ("");
       ::XMLSchema::string< char > exclusiveUser ("");
       ::XMLSchema::string< char > optional ("");
-      
+
       if (src.provider)
         provider = tval;
       else
         provider = fval;
-      
+
       if (src.exclusiveUser)
         exclusiveUser = tval;
       else
         provider = fval;
-      
+
       if (src.exclusiveProvider)
         exclusiveProvider = tval;
       else
         provider = fval;
-      
+
       if (src.optional)
         optional = tval;
       else
         provider = fval;
-      
+
       ComponentPortDescription cpd (
         name,
         stype,
@@ -116,39 +124,39 @@ namespace CIAO
         case ::Deployment::Facet:
           cpd.kind (CCMComponentPortKind::Facet);
           break;
-          
+
         case ::Deployment::SimplexReceptacle:
           cpd.kind (CCMComponentPortKind::SimplexReceptacle);
           break;
-          
+
         case ::Deployment::MultiplexReceptacle:
           cpd.kind (CCMComponentPortKind::MultiplexReceptacle);
           break;
-          
+
         case ::Deployment::EventEmitter:
           cpd.kind (CCMComponentPortKind::EventEmitter);
           break;
-          
+
         case ::Deployment::EventPublisher:
           cpd.kind (CCMComponentPortKind::EventPublisher);
           break;
-          
+
         case ::Deployment::EventConsumer:
           cpd.kind (CCMComponentPortKind::EventConsumer);
           break;
-          
+
         default:
           ACE_ERROR ((LM_ERROR, "Invalid port kind in connection %s\n",
                       name.c_str ()));
         }
-      
+
 
       if (src.supportedType.length () > 0)
         cpd.supportedType (
-          XMLSchema::string< char > ((src.supportedType[0])));      
+          XMLSchema::string< char > ((src.supportedType[0])));
 
       return cpd;
     }
-  
+
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
index a240b597074..d43ebc689b1 100644
--- a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
@@ -15,12 +15,12 @@ namespace CIAO
         ::Deployment::PlanSubcomponentPortEndpoints &dest)
     {
       CIAO_TRACE("PSPE_Handler::sub_component_port_endpoints");
-      
+
       PlanConnectionDescription::internalEndpoint_const_iterator iei_e =
         src.end_internalEndpoint ();
       CORBA::ULong pos = 0;
       dest.length (src.count_internalEndpoint ());
-      
+
       for (PlanConnectionDescription::internalEndpoint_const_iterator iei_b =
              src.begin_internalEndpoint ();
            iei_b != iei_e;
@@ -50,9 +50,9 @@ namespace CIAO
         }
 
       CORBA::ULong tmp = 0;
-      IDD_Handler::IDREF.find_ref (ACE_CString (src.instance ().id ().c_str ()), 
-					    tmp);
-            
+      IDD_Handler::IDREF.find_ref (ACE_CString (src.instance ().id ().c_str ()),
+              tmp);
+
       dest.instanceRef = tmp;
 
       switch (src.kind ().integral ())
@@ -60,30 +60,38 @@ namespace CIAO
           case CCMComponentPortKind::Facet_l:
             dest.kind = Deployment::Facet;
             break;
-            
+
           case CCMComponentPortKind::SimplexReceptacle_l:
             dest.kind = Deployment::SimplexReceptacle;
             break;
-            
+
           case CCMComponentPortKind::MultiplexReceptacle_l:
             dest.kind = Deployment::MultiplexReceptacle;
             break;
-            
+
           case CCMComponentPortKind::EventEmitter_l:
             dest.kind = Deployment::EventEmitter;
             break;
-            
+
           case CCMComponentPortKind::EventPublisher_l:
             dest.kind = Deployment::EventPublisher;
             break;
-            
+
           case CCMComponentPortKind::EventConsumer_l:
             dest.kind = Deployment::EventConsumer;
             break;
-          
+
+          case CCMComponentPortKind::rtecEventPublisher_l:
+            dest.kind = Deployment::rtecEventPublisher;
+            break;
+
+          case CCMComponentPortKind::rtecEventConsumer_l:
+            dest.kind = Deployment::rtecEventConsumer;
+            break;
+
           default:
             ACE_DEBUG ((LM_DEBUG, "Invalid port kind in connection\n"));
-            
+
          }
     }
 
@@ -97,38 +105,38 @@ namespace CIAO
       XMLSchema::string< char > prov  ("");
       ACE_CString id;
       IDD_Handler::IDREF.find_ref(src.instanceRef, id);
-      XMLSchema::IDREF < ACE_TCHAR > idref(id.c_str()); 
-      
+      XMLSchema::IDREF < ACE_TCHAR > idref(id.c_str());
+
       if (src.provider)
         prov = tval;
 
       PlanSubcomponentPortEndpoint pspe (pname,
-					 CCMComponentPortKind::Facet,
-					 idref);
+           CCMComponentPortKind::Facet,
+           idref);
       pspe.provider (prov);
-      
+
       switch (src.kind)
-        {    
+        {
         case ::Deployment::Facet:
           pspe.kind (CCMComponentPortKind::Facet);
           break;
-          
+
         case ::Deployment::SimplexReceptacle:
           pspe.kind (CCMComponentPortKind::SimplexReceptacle);
           break;
-          
+
         case ::Deployment::MultiplexReceptacle:
           pspe.kind (CCMComponentPortKind::MultiplexReceptacle);
           break;
-          
+
         case ::Deployment::EventEmitter:
           pspe.kind (CCMComponentPortKind::EventEmitter);
           break;
-          
+
         case ::Deployment::EventPublisher:
           pspe.kind (CCMComponentPortKind::EventPublisher);
           break;
-        
+
         case ::Deployment::EventConsumer:
           pspe.kind (CCMComponentPortKind::EventConsumer);
           break;
@@ -146,7 +154,7 @@ namespace CIAO
           break;
 
         }
-      
+
 
       return pspe;
     }