Fixed various bugs to support event channel federation. Fixed DomainApplicationManager to install CIAO event service one at at a time to maintain the right EventServiceMap.

11 files changed, 1556 insertions, 4128 deletions

diff --git a/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index db82a68dfcd..0fb6bd3de0a 100644
--- a/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -697,11 +697,11 @@ install_all_es (void)
           ::Deployment::NodeApplication_ptr my_na =
               (entry->int_id_).node_application_.in ();
 
-          ::Deployment::CIAO_Event_Services_var event_services =
-              my_na->install_es (this->esd_.in ());
+          ::CIAO::CIAO_Event_Service_var ciao_es =
+              my_na->install_es (this->esd_[j]);
 
           // Add these returned ES objects into the cached map
-          this->add_es_to_map (this->esd_, event_services);
+          this->add_es_to_map (this->esd_[j].name.in (), ciao_es.in ());
         }
     }
   ACE_CATCHANY
@@ -717,21 +717,16 @@ install_all_es (void)
 
 void
 CIAO::DomainApplicationManager_Impl::
-add_es_to_map (DAnCE::EventServiceDeploymentDescriptions * es_infos,
-               Deployment::CIAO_Event_Services * event_services)
+add_es_to_map (const char * node_name,
+               CIAO::CIAO_Event_Service * ciao_es)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
 {
   ACE_TRY
     {
-      CORBA::ULong es_length = event_services->length ();
-
-      for (CORBA::ULong i = 0; i < es_length; ++i)
-        {
-          this->es_map_.bind (
-            (*es_infos)[i].name.in (),
-            CIAO::CIAO_Event_Service::_duplicate ((*event_services)[i]));
-        }
+      this->es_map_.bind (
+        node_name,
+        CIAO::CIAO_Event_Service::_duplicate (ciao_es));
     }
   ACE_CATCHANY
     {
diff --git a/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index 96e11649c46..b628b699462 100644
--- a/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -398,8 +398,8 @@ namespace CIAO
      * Add all CIAO_Event_Service objects into the cached map.
      */
     virtual void
-    add_es_to_map (DAnCE::EventServiceDeploymentDescriptions * es_infos,
-                   Deployment::CIAO_Event_Services * event_services)
+    add_es_to_map (const char* node_name,
+                   CIAO::CIAO_Event_Service * ciao_es)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       Deployment::StartError));
 
diff --git a/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 25d3f67129e..b864c78d504 100644
--- a/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -610,60 +610,84 @@ CIAO::NodeApplication_Impl::get_containers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return 0;
 }
 
-::Deployment::CIAO_Event_Services *
+CIAO::CIAO_Event_Service *
 CIAO::NodeApplication_Impl::
-install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescriptions & es_infos
+install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info
             ACE_ENV_ARG_DECL)
 ACE_THROW_SPEC ((::CORBA::SystemException,
                  ::Deployment::InstallationFailure))
 {
-  Deployment::CIAO_Event_Services_var retv;
-  ACE_NEW_RETURN (retv,
-                  Deployment::CIAO_Event_Services,
-                  0);
-
-  CORBA::ULong es_len = es_infos.length ();
-
-  for (CORBA::ULong i = 0; i < es_len; ++i)
+  ACE_TRY
     {
-      CIAO_Event_Service_var ciao_es =
-        es_factory_.create (es_infos[i].type);
+      ACE_DEBUG ((LM_DEBUG, "\nNodeApplication_Impl::install_es() called.\n\n"));
 
-      // Set up the event channel federation configurations
-      if (es_infos[i].type == CIAO::RTEC)
-        {
-          // Narrow the event service to CIAO_RT_Event_Service
-          ::CIAO::CIAO_RT_Event_Service_var ciao_rtes =
-            ::CIAO::CIAO_RT_Event_Service::_narrow (ciao_es);
-
-          if (CORBA::is_nil (ciao_rtes.in ()))
-            ACE_THROW ((::Deployment::InstallationFailure ()));
-
-          // Set up the event channel federations
-          for (CORBA::ULong j = 0; j < es_infos[i].addr_srvs.length (); ++j)
-            ciao_rtes->create_addr_serv (
-              es_infos[i].addr_srvs[j].name.in (),
-              es_infos[i].addr_srvs[j].port,
-              es_infos[i].addr_srvs[j].address);
-
-          for (CORBA::ULong j = 0; j < es_infos[i].senders.length (); ++j)
-            ciao_rtes->create_sender (
-              es_infos[i].senders[j].addr_serv_id.in ());
-
-          for (CORBA::ULong j = 0; j < es_infos[i].receivers.length (); ++j)
-            ciao_rtes->create_receiver (
-              es_infos[i].receivers[j].addr_serv_id.in (),
-              es_infos[i].receivers[j].is_multicast,
-              es_infos[i].receivers[j].listen_port);
-        }
-  
-      CORBA::ULong curr_len = retv->length ();
-      retv->length (curr_len + 1);
+          CIAO_Event_Service_var ciao_es =
+            es_factory_.create (es_info.type);
+
+          // Set up the event channel federation configurations
+          if (es_info.type == CIAO::RTEC)
+            {
+              // Narrow the event service to CIAO_RT_Event_Service
+              ::CIAO::CIAO_RT_Event_Service_var ciao_rtes =
+                ::CIAO::CIAO_RT_Event_Service::_narrow (ciao_es);
+
+              if (CORBA::is_nil (ciao_rtes.in ()))
+                ACE_THROW ((::Deployment::InstallationFailure ()));
+
+              // Set up the event channel federations
+              for (CORBA::ULong j = 0; j < es_info.addr_servs.length (); ++j)
+                {
+                  bool retv = 
+                    ciao_rtes->create_addr_serv (
+                      es_info.addr_servs[j].name.in (),
+                      es_info.addr_servs[j].port,
+                      es_info.addr_servs[j].address);
+
+                  if (retv == false)
+                    {
+                      ACE_DEBUG ((LM_ERROR, "RTEC failed to create addr serv object\t\n"));
+                      ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+                    }
+                }
+              for (CORBA::ULong j = 0; j < es_info.senders.length (); ++j)
+                {
+                  bool retv = 
+                    ciao_rtes->create_sender (
+                      es_info.senders[j].addr_serv_id.in ());
+
+                  if (retv == false)
+                    {
+                      ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP sender object\t\n"));
+                      ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+                    }
+                }
+
+              for (CORBA::ULong j = 0; j < es_info.receivers.length (); ++j)
+                {
+                  bool retv = 
+                    ciao_rtes->create_receiver (
+                      es_info.receivers[j].addr_serv_id.in (),
+                      es_info.receivers[j].is_multicast,
+                      es_info.receivers[j].listen_port);
+
+                  if (retv == false)
+                    {
+                      ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP receiver object\t\n"));
+                      ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+                    }
+                }
+            }
 
-      retv[curr_len] =
-        CIAO::CIAO_Event_Service::_duplicate (ciao_es.in ());
+          return ciao_es._retn ();
     }
-  return retv._retn ();
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "NodeApplication_Impl::finishLaunch\t\n");
+      ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+    }
+
+  ACE_ENDTRY;
 }
 
 
diff --git a/DAnCE/NodeApplication/NodeApplication_Impl.h b/DAnCE/NodeApplication/NodeApplication_Impl.h
index b91beeecbc3..a5e7e256974 100644
--- a/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -157,8 +157,8 @@ namespace CIAO
                        ::Components::InvalidConfiguration));
 
     /// Install a number of CIAO_Event_Service objects within the NA
-    virtual ::Deployment::CIAO_Event_Services *
-      install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescriptions & es_infos
+    virtual ::CIAO::CIAO_Event_Service *
+      install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info
                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((::CORBA::SystemException,
                        ::Deployment::InstallationFailure));
diff --git a/ciao/Deployment_Core.idl b/ciao/Deployment_Core.idl
index c859de1e24b..b61836faf7d 100644
--- a/ciao/Deployment_Core.idl
+++ b/ciao/Deployment_Core.idl
@@ -245,11 +245,11 @@ module Deployment
               ::Components::RemoveFailure);
 
     /// CIAO specific extension
-    /// This operation will create one or more CIAO_Event_Service objects
+    /// This operation will create one CIAO_Event_Service object
     /// within the NodeApplication, which will be used to mediate the
     /// communication of CCM events
-    CIAO_Event_Services install_es (
-        in CIAO::DAnCE::EventServiceDeploymentDescriptions es_infos)
+    CIAO::CIAO_Event_Service install_es (
+        in CIAO::DAnCE::EventServiceDeploymentDescription es_info)
       raises (InstallationFailure);
 
     /// CIAO specific extensions
diff --git a/ciao/Deployment_Events.idl b/ciao/Deployment_Events.idl
index 37aa6d6e58e..95774dba3f7 100644
--- a/ciao/Deployment_Events.idl
+++ b/ciao/Deployment_Events.idl
@@ -65,13 +65,14 @@ module CIAO
       unsigned short listen_port;
     };
     typedef sequence<UPDReceiver> UPDReceivers;
-
+/*
     struct EventHandler
     {
       string name;
       boolean is_multicast;
     };
     typedef sequence<EventHandler> EventHandlers;
+    */
 
     /// CIAO specific extension to describe pub/sub services in the deployment
     struct EventServiceDeploymentDescription
@@ -82,7 +83,7 @@ module CIAO
       string svc_cfg_file;
 
       EventFilters filters;
-      AddrServers addr_srvs;
+      AddrServers addr_servs;
       UDPSenders senders;
       UPDReceivers receivers;
     };
diff --git a/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
index 1141de73920..b183652312a 100644
--- a/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+++ b/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
@@ -334,11 +334,14 @@ namespace CIAO
     // Initialize the address server with the desired address.
     // This will be used by the sender object and the multicast
     // receiver.
+    
     ACE_INET_Addr send_addr (port, address);
-    SimpleAddressServer addr_srv_impl (send_addr);
+    //ACE_INET_Addr send_addr (10001, ACE_DEFAULT_MULTICAST_ADDR);
+
+    SimpleAddressServer * addr_srv_impl = new SimpleAddressServer (send_addr);
 
     PortableServer::ObjectId_var addr_srv_oid =
-      this->root_poa_->activate_object (&addr_srv_impl);
+      this->root_poa_->activate_object (addr_srv_impl);
 
     CORBA::Object_var addr_srv_obj = 
       this->root_poa_->id_to_reference (addr_srv_oid.in());
@@ -427,12 +430,21 @@ namespace CIAO
                     false);
 
     RtecUDPAdmin::AddrServer_var addr_srv;
-    if (this->addr_serv_map_.find (addr_serv_id, addr_srv) != 0)
-      return false;
 
-    receiver->init (this->rt_event_channel_.in (), 
-                    clone,
-                    addr_srv.in ());
+    // AddressServer is necessary when "multicast" is enabled, but not for "udp"
+    if (is_multicast)
+      {
+        if (this->addr_serv_map_.find (addr_serv_id, addr_srv) != 0)
+          return false;
+
+        receiver->init (this->rt_event_channel_.in (), 
+                        clone,
+                        addr_srv.in ());
+      }
+    else
+      {
+        receiver->init (this->rt_event_channel_.in (), clone, 0);
+      }
 
     // Setup the registration and connect to the event channel
     ACE_SupplierQOS_Factory supp_qos_fact;
@@ -452,13 +464,15 @@ namespace CIAO
       } 
     else 
       {
+        ACE_DEBUG ((LM_DEBUG, "\nUDP Event Hander Port [%d]\n\n", listen_port));
+
         auto_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in()));
         udp_eh->reactor (this->orb_->orb_core ()->reactor ());
 
         ACE_INET_Addr local_addr (listen_port);
         if (udp_eh->open (local_addr) == -1)
           {
-            ACE_DEBUG ((LM_ERROR, "Cannot open event handler.\n"));
+            ACE_DEBUG ((LM_ERROR, "Cannot open event handler on port [%d]\n", listen_port));
             return false;
           }
         ACE_AUTO_PTR_RESET (eh, udp_eh.release(), ACE_Event_Handler);
diff --git a/docs/schema/CIAOEvents.xsd b/docs/schema/CIAOEvents.xsd
index 6ea307609f3..645d7a6e530 100644
--- a/docs/schema/CIAOEvents.xsd
+++ b/docs/schema/CIAOEvents.xsd
@@ -43,12 +43,13 @@
       <xsd:element name="type" type="CIAO:EventServiceType"/>
       <xsd:element name="svc_cfg_file" type="xsd:string"/>
       <xsd:element name="filter" type="CIAO:Filter" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="addr_serv" type="CIAO:AddressServerDescription" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="udp_sender" type="CIAO:UDPSenderDescription" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="udp_receiver" type="CIAO:UDPReceiverDescription" minOccurs="0" maxOccurs="unbounded"/> 
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
 
-
-
   
 <!-- =============================================================== -->
 <!--                  CIAO Event Filter Description                  -->
@@ -76,37 +77,28 @@
 <!--            CIAO Event Service Federation Description            -->
 <!-- =============================================================== -->  
 
-  <xsd:complexType name="MCastSenderDescription">
+  <xsd:complexType name="AddressServerDescription">
     <xsd:sequence>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="type" type="CIAO:EventServiceType"/>
-      <xsd:element name="svc_cfg_file" type="xsd:string"/>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="port" type="xsd:unsignedShort"/>
+      <xsd:element name="address" type="xsd:string"/>
     </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
-  
-  <xsd:complexType name="MCastReceiverDescription">
-    <xsd:sequence>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="type" type="CIAO:EventServiceType"/>
-      <xsd:element name="svc_cfg_file" type="xsd:string"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>  
 
-  <xsd:complexType name="EC_to_MCastSender">
+  <xsd:complexType name="UDPSenderDescription">
     <xsd:sequence>
-      <xsd:element name="destination" type="xsd:string"/>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="addr_serv_id" type="xsd:string"/>
     </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>    
   </xsd:complexType>
   
-  <xsd:complexType name="MCastReceiver_to_EC">
+  <xsd:complexType name="UDPReceiverDescription">
     <xsd:sequence>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="destination" type="xsd:string"/>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="addr_serv_id" type="xsd:string" minOccurs="0" />
+      <xsd:element name="is_multicast" type="xsd:boolean"/>
+      <xsd:element name="listen_port" type="xsd:unsignedShort"/>
     </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>       
-  </xsd:complexType>  
-  
+  </xsd:complexType> 
+
 </xsd:schema>
diff --git a/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp b/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
index de7c731b954..2f2db561642 100644
--- a/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
+++ b/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
@@ -3,3013 +3,1358 @@
  *
  * Changes made to this code will most likely be overwritten
  * when the handlers are recompiled.
- *
+ * 
  * If you find errors or feel that there are bugfixes to be made,
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
-
+ 
 #include "CIAOEvents.hpp"
 
 namespace CIAO
 {
   namespace Config_Handlers
   {
+    // EventServiceType
+    // 
 
-      // EventServiceType
-      //
+    EventServiceType::Value EventServiceType::
+    integral () const
+    {
+      return v_;
+    }
 
-      EventServiceType::Value EventServiceType::
-      integral () const
-      {
-        return v_;
-      }
+    bool
+    operator== (::CIAO::Config_Handlers::EventServiceType const& a, ::CIAO::Config_Handlers::EventServiceType const& b)
+    {
+      return a.v_ == b.v_;
+    }
 
-      bool
-      operator== (::CIAO::Config_Handlers::EventServiceType const& a, ::CIAO::Config_Handlers::EventServiceType const& b)
-      {
-        return a.v_ == b.v_;
-      }
+    bool
+    operator!= (::CIAO::Config_Handlers::EventServiceType const& a, ::CIAO::Config_Handlers::EventServiceType const& b)
+    {
+      return a.v_ != b.v_;
+    }
 
-      bool
-      operator!= (::CIAO::Config_Handlers::EventServiceType const& a, ::CIAO::Config_Handlers::EventServiceType const& b)
-      {
-        return a.v_ != b.v_;
-      }
+    EventServiceType::
+    EventServiceType (EventServiceType::Value v)
+    : v_ (v)
+    {
+    }
 
-      EventServiceType::
-      EventServiceType (EventServiceType::Value v)
-      : v_ (v)
-      {
-      }
+    // CIAOEventsDef
+    // 
 
-      // CIAOEventsDef
-      //
+    CIAOEventsDef::
+    CIAOEventsDef ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
+    {
+    }
 
-      CIAOEventsDef::
-      CIAOEventsDef ()
-      :
-      ::XSCRT::Type (),
-      regulator__ ()
+    CIAOEventsDef::
+    CIAOEventsDef (::CIAO::Config_Handlers::CIAOEventsDef const& s)
+    :
+    ::XSCRT::Type (),
+    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    regulator__ ()
+    {
       {
+        for (eventServiceConfiguration_const_iterator i (s.eventServiceConfiguration_.begin ());i != s.eventServiceConfiguration_.end ();++i) add_eventServiceConfiguration (*i);
       }
 
-      CIAOEventsDef::
-      CIAOEventsDef (::CIAO::Config_Handlers::CIAOEventsDef const& s)
-      :
-      ::XSCRT::Type (),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        {
-          for (eventServiceConfiguration_const_iterator i (s.eventServiceConfiguration_.begin ());i != s.eventServiceConfiguration_.end ();++i) add_eventServiceConfiguration (*i);
-        }
-
-        if (id_.get ()) id_->container (this);
-      }
+      if (id_.get ()) id_->container (this);
+    }
 
-      ::CIAO::Config_Handlers::CIAOEventsDef& CIAOEventsDef::
-      operator= (::CIAO::Config_Handlers::CIAOEventsDef const& s)
+    ::CIAO::Config_Handlers::CIAOEventsDef& CIAOEventsDef::
+    operator= (::CIAO::Config_Handlers::CIAOEventsDef const& s)
+    {
+      eventServiceConfiguration_.clear ();
       {
-        eventServiceConfiguration_.clear ();
-        {
-          for (eventServiceConfiguration_const_iterator i (s.eventServiceConfiguration_.begin ());i != s.eventServiceConfiguration_.end ();++i) add_eventServiceConfiguration (*i);
-        }
-
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
-
-        return *this;
+        for (eventServiceConfiguration_const_iterator i (s.eventServiceConfiguration_.begin ());i != s.eventServiceConfiguration_.end ();++i) add_eventServiceConfiguration (*i);
       }
 
+      if (s.id_.get ()) id (*(s.id_));
+      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-      // CIAOEventsDef
-      //
-      CIAOEventsDef::eventServiceConfiguration_iterator CIAOEventsDef::
-      begin_eventServiceConfiguration ()
-      {
-        return eventServiceConfiguration_.begin ();
-      }
-
-      CIAOEventsDef::eventServiceConfiguration_iterator CIAOEventsDef::
-      end_eventServiceConfiguration ()
-      {
-        return eventServiceConfiguration_.end ();
-      }
+      return *this;
+    }
 
-      CIAOEventsDef::eventServiceConfiguration_const_iterator CIAOEventsDef::
-      begin_eventServiceConfiguration () const
-      {
-        return eventServiceConfiguration_.begin ();
-      }
 
-      CIAOEventsDef::eventServiceConfiguration_const_iterator CIAOEventsDef::
-      end_eventServiceConfiguration () const
-      {
-        return eventServiceConfiguration_.end ();
-      }
+    // CIAOEventsDef
+    // 
+    CIAOEventsDef::eventServiceConfiguration_iterator CIAOEventsDef::
+    begin_eventServiceConfiguration ()
+    {
+      return eventServiceConfiguration_.begin ();
+    }
 
-      void CIAOEventsDef::
-      add_eventServiceConfiguration (::CIAO::Config_Handlers::EventServiceDescription const& e)
-      {
-        eventServiceConfiguration_.push_back (e);
-      }
+    CIAOEventsDef::eventServiceConfiguration_iterator CIAOEventsDef::
+    end_eventServiceConfiguration ()
+    {
+      return eventServiceConfiguration_.end ();
+    }
 
-      size_t CIAOEventsDef::
-      count_eventServiceConfiguration(void) const
-      {
-        return eventServiceConfiguration_.size ();
-      }
+    CIAOEventsDef::eventServiceConfiguration_const_iterator CIAOEventsDef::
+    begin_eventServiceConfiguration () const
+    {
+      return eventServiceConfiguration_.begin ();
+    }
 
-      // CIAOEventsDef
-      //
-      bool CIAOEventsDef::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
+    CIAOEventsDef::eventServiceConfiguration_const_iterator CIAOEventsDef::
+    end_eventServiceConfiguration () const
+    {
+      return eventServiceConfiguration_.end ();
+    }
 
-      ::XMLSchema::ID< ACE_TCHAR > const& CIAOEventsDef::
-      id () const
-      {
-        return *id_;
-      }
+    void CIAOEventsDef::
+    add_eventServiceConfiguration (::CIAO::Config_Handlers::EventServiceDescription const& e)
+    {
+      eventServiceConfiguration_.push_back (e);
+    }
 
-      ::XMLSchema::ID< ACE_TCHAR >& CIAOEventsDef::
-      id ()
-      {
-        return *id_;
-      }
+    size_t CIAOEventsDef::
+    count_eventServiceConfiguration(void) const
+    {
+      return eventServiceConfiguration_.size ();
+    }
 
-      void CIAOEventsDef::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
+    // CIAOEventsDef
+    // 
+    bool CIAOEventsDef::
+    id_p () const
+    {
+      return id_.get () != 0;
+    }
 
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
+    ::XMLSchema::ID< ACE_TCHAR > const& CIAOEventsDef::
+    id () const
+    {
+      return *id_;
+    }
 
+    ::XMLSchema::ID< ACE_TCHAR >& CIAOEventsDef::
+    id ()
+    {
+      return *id_;
+    }
 
-      // EventServiceDescription
-      //
-
-      EventServiceDescription::
-      EventServiceDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                               ::XMLSchema::string< ACE_TCHAR > const& node__,
-                               ::CIAO::Config_Handlers::EventServiceType const& type__,
-                               ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (type__)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (svc_cfg_file__)),
-      regulator__ ()
+    void CIAOEventsDef::
+    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    {
+      if (id_.get ())
       {
-        name_->container (this);
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
+        *id_ = e;
       }
 
-      EventServiceDescription::
-      EventServiceDescription (::CIAO::Config_Handlers::EventServiceDescription const& s)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (*s.type_)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (*s.svc_cfg_file_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
+      else
       {
-        name_->container (this);
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
-        {
-          for (filter_const_iterator i (s.filter_.begin ());i != s.filter_.end ();++i) add_filter (*i);
-        }
-
-        if (id_.get ()) id_->container (this);
+        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        id_->container (this);
       }
+    }
 
-      ::CIAO::Config_Handlers::EventServiceDescription& EventServiceDescription::
-      operator= (::CIAO::Config_Handlers::EventServiceDescription const& s)
-      {
-        name (s.name ());
-
-        node (s.node ());
-
-        type (s.type ());
-
-        svc_cfg_file (s.svc_cfg_file ());
-
-        filter_.clear ();
-        {
-          for (filter_const_iterator i (s.filter_.begin ());i != s.filter_.end ();++i) add_filter (*i);
-        }
-
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
-
-        return *this;
-      }
 
+    // EventServiceDescription
+    // 
+
+    EventServiceDescription::
+    EventServiceDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                             ::XMLSchema::string< ACE_TCHAR > const& node__,
+                             ::CIAO::Config_Handlers::EventServiceType const& type__,
+                             ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
+    type_ (new ::CIAO::Config_Handlers::EventServiceType (type__)),
+    svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (svc_cfg_file__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      node_->container (this);
+      type_->container (this);
+      svc_cfg_file_->container (this);
+    }
 
-      // EventServiceDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& EventServiceDescription::
-      name () const
+    EventServiceDescription::
+    EventServiceDescription (::CIAO::Config_Handlers::EventServiceDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
+    type_ (new ::CIAO::Config_Handlers::EventServiceType (*s.type_)),
+    svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (*s.svc_cfg_file_)),
+    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    regulator__ ()
+    {
+      name_->container (this);
+      node_->container (this);
+      type_->container (this);
+      svc_cfg_file_->container (this);
       {
-        return *name_;
+        for (filter_const_iterator i (s.filter_.begin ());i != s.filter_.end ();++i) add_filter (*i);
       }
 
-      void EventServiceDescription::
-      name (::XMLSchema::string< ACE_TCHAR > const& e)
       {
-        *name_ = e;
+        for (addr_serv_const_iterator i (s.addr_serv_.begin ());i != s.addr_serv_.end ();++i) add_addr_serv (*i);
       }
 
-      // EventServiceDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& EventServiceDescription::
-      node () const
       {
-        return *node_;
+        for (udp_sender_const_iterator i (s.udp_sender_.begin ());i != s.udp_sender_.end ();++i) add_udp_sender (*i);
       }
 
-      void EventServiceDescription::
-      node (::XMLSchema::string< ACE_TCHAR > const& e)
       {
-        *node_ = e;
+        for (udp_receiver_const_iterator i (s.udp_receiver_.begin ());i != s.udp_receiver_.end ();++i) add_udp_receiver (*i);
       }
 
-      // EventServiceDescription
-      //
-      ::CIAO::Config_Handlers::EventServiceType const& EventServiceDescription::
-      type () const
-      {
-        return *type_;
-      }
+      if (id_.get ()) id_->container (this);
+    }
 
-      void EventServiceDescription::
-      type (::CIAO::Config_Handlers::EventServiceType const& e)
-      {
-        *type_ = e;
-      }
+    ::CIAO::Config_Handlers::EventServiceDescription& EventServiceDescription::
+    operator= (::CIAO::Config_Handlers::EventServiceDescription const& s)
+    {
+      name (s.name ());
 
-      // EventServiceDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& EventServiceDescription::
-      svc_cfg_file () const
-      {
-        return *svc_cfg_file_;
-      }
+      node (s.node ());
 
-      void EventServiceDescription::
-      svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *svc_cfg_file_ = e;
-      }
+      type (s.type ());
 
-      // EventServiceDescription
-      //
-      EventServiceDescription::filter_iterator EventServiceDescription::
-      begin_filter ()
-      {
-        return filter_.begin ();
-      }
+      svc_cfg_file (s.svc_cfg_file ());
 
-      EventServiceDescription::filter_iterator EventServiceDescription::
-      end_filter ()
+      filter_.clear ();
       {
-        return filter_.end ();
+        for (filter_const_iterator i (s.filter_.begin ());i != s.filter_.end ();++i) add_filter (*i);
       }
 
-      EventServiceDescription::filter_const_iterator EventServiceDescription::
-      begin_filter () const
+      addr_serv_.clear ();
       {
-        return filter_.begin ();
+        for (addr_serv_const_iterator i (s.addr_serv_.begin ());i != s.addr_serv_.end ();++i) add_addr_serv (*i);
       }
 
-      EventServiceDescription::filter_const_iterator EventServiceDescription::
-      end_filter () const
+      udp_sender_.clear ();
       {
-        return filter_.end ();
+        for (udp_sender_const_iterator i (s.udp_sender_.begin ());i != s.udp_sender_.end ();++i) add_udp_sender (*i);
       }
 
-      void EventServiceDescription::
-      add_filter (::CIAO::Config_Handlers::Filter const& e)
+      udp_receiver_.clear ();
       {
-        filter_.push_back (e);
+        for (udp_receiver_const_iterator i (s.udp_receiver_.begin ());i != s.udp_receiver_.end ();++i) add_udp_receiver (*i);
       }
 
-      size_t EventServiceDescription::
-      count_filter(void) const
-      {
-        return filter_.size ();
-      }
+      if (s.id_.get ()) id (*(s.id_));
+      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-      // EventServiceDescription
-      //
-      bool EventServiceDescription::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
+      return *this;
+    }
 
-      ::XMLSchema::ID< ACE_TCHAR > const& EventServiceDescription::
-      id () const
-      {
-        return *id_;
-      }
 
-      ::XMLSchema::ID< ACE_TCHAR >& EventServiceDescription::
-      id ()
-      {
-        return *id_;
-      }
+    // EventServiceDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& EventServiceDescription::
+    name () const
+    {
+      return *name_;
+    }
 
-      void EventServiceDescription::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
+    void EventServiceDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
+    // EventServiceDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& EventServiceDescription::
+    node () const
+    {
+      return *node_;
+    }
 
+    void EventServiceDescription::
+    node (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *node_ = e;
+    }
 
-      // FilterType
-      //
+    // EventServiceDescription
+    // 
+    ::CIAO::Config_Handlers::EventServiceType const& EventServiceDescription::
+    type () const
+    {
+      return *type_;
+    }
 
-      FilterType::Value FilterType::
-      integral () const
-      {
-        return v_;
-      }
+    void EventServiceDescription::
+    type (::CIAO::Config_Handlers::EventServiceType const& e)
+    {
+      *type_ = e;
+    }
 
-      bool
-      operator== (::CIAO::Config_Handlers::FilterType const& a, ::CIAO::Config_Handlers::FilterType const& b)
-      {
-        return a.v_ == b.v_;
-      }
+    // EventServiceDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& EventServiceDescription::
+    svc_cfg_file () const
+    {
+      return *svc_cfg_file_;
+    }
 
-      bool
-      operator!= (::CIAO::Config_Handlers::FilterType const& a, ::CIAO::Config_Handlers::FilterType const& b)
-      {
-        return a.v_ != b.v_;
-      }
+    void EventServiceDescription::
+    svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *svc_cfg_file_ = e;
+    }
 
-      FilterType::
-      FilterType (FilterType::Value v)
-      : v_ (v)
-      {
-      }
+    // EventServiceDescription
+    // 
+    EventServiceDescription::filter_iterator EventServiceDescription::
+    begin_filter ()
+    {
+      return filter_.begin ();
+    }
 
-      // Filter
-      //
-
-      Filter::
-      Filter (::XMLSchema::string< ACE_TCHAR > const& name__,
-              ::CIAO::Config_Handlers::FilterType const& type__)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-      type_ (new ::CIAO::Config_Handlers::FilterType (type__)),
-      regulator__ ()
-      {
-        name_->container (this);
-        type_->container (this);
-      }
+    EventServiceDescription::filter_iterator EventServiceDescription::
+    end_filter ()
+    {
+      return filter_.end ();
+    }
 
-      Filter::
-      Filter (::CIAO::Config_Handlers::Filter const& s)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-      type_ (new ::CIAO::Config_Handlers::FilterType (*s.type_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        name_->container (this);
-        type_->container (this);
-        {
-          for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-        }
+    EventServiceDescription::filter_const_iterator EventServiceDescription::
+    begin_filter () const
+    {
+      return filter_.begin ();
+    }
 
-        if (id_.get ()) id_->container (this);
-      }
+    EventServiceDescription::filter_const_iterator EventServiceDescription::
+    end_filter () const
+    {
+      return filter_.end ();
+    }
 
-      ::CIAO::Config_Handlers::Filter& Filter::
-      operator= (::CIAO::Config_Handlers::Filter const& s)
-      {
-        name (s.name ());
+    void EventServiceDescription::
+    add_filter (::CIAO::Config_Handlers::Filter const& e)
+    {
+      filter_.push_back (e);
+    }
 
-        type (s.type ());
+    size_t EventServiceDescription::
+    count_filter(void) const
+    {
+      return filter_.size ();
+    }
 
-        source_.clear ();
-        {
-          for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-        }
+    // EventServiceDescription
+    // 
+    EventServiceDescription::addr_serv_iterator EventServiceDescription::
+    begin_addr_serv ()
+    {
+      return addr_serv_.begin ();
+    }
 
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+    EventServiceDescription::addr_serv_iterator EventServiceDescription::
+    end_addr_serv ()
+    {
+      return addr_serv_.end ();
+    }
 
-        return *this;
-      }
+    EventServiceDescription::addr_serv_const_iterator EventServiceDescription::
+    begin_addr_serv () const
+    {
+      return addr_serv_.begin ();
+    }
 
+    EventServiceDescription::addr_serv_const_iterator EventServiceDescription::
+    end_addr_serv () const
+    {
+      return addr_serv_.end ();
+    }
 
-      // Filter
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& Filter::
-      name () const
-      {
-        return *name_;
-      }
+    void EventServiceDescription::
+    add_addr_serv (::CIAO::Config_Handlers::AddressServerDescription const& e)
+    {
+      addr_serv_.push_back (e);
+    }
 
-      void Filter::
-      name (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *name_ = e;
-      }
+    size_t EventServiceDescription::
+    count_addr_serv(void) const
+    {
+      return addr_serv_.size ();
+    }
 
-      // Filter
-      //
-      ::CIAO::Config_Handlers::FilterType const& Filter::
-      type () const
-      {
-        return *type_;
-      }
+    // EventServiceDescription
+    // 
+    EventServiceDescription::udp_sender_iterator EventServiceDescription::
+    begin_udp_sender ()
+    {
+      return udp_sender_.begin ();
+    }
 
-      void Filter::
-      type (::CIAO::Config_Handlers::FilterType const& e)
-      {
-        *type_ = e;
-      }
+    EventServiceDescription::udp_sender_iterator EventServiceDescription::
+    end_udp_sender ()
+    {
+      return udp_sender_.end ();
+    }
 
-      // Filter
-      //
-      Filter::source_iterator Filter::
-      begin_source ()
-      {
-        return source_.begin ();
-      }
+    EventServiceDescription::udp_sender_const_iterator EventServiceDescription::
+    begin_udp_sender () const
+    {
+      return udp_sender_.begin ();
+    }
 
-      Filter::source_iterator Filter::
-      end_source ()
-      {
-        return source_.end ();
-      }
+    EventServiceDescription::udp_sender_const_iterator EventServiceDescription::
+    end_udp_sender () const
+    {
+      return udp_sender_.end ();
+    }
 
-      Filter::source_const_iterator Filter::
-      begin_source () const
-      {
-        return source_.begin ();
-      }
+    void EventServiceDescription::
+    add_udp_sender (::CIAO::Config_Handlers::UDPSenderDescription const& e)
+    {
+      udp_sender_.push_back (e);
+    }
 
-      Filter::source_const_iterator Filter::
-      end_source () const
-      {
-        return source_.end ();
-      }
+    size_t EventServiceDescription::
+    count_udp_sender(void) const
+    {
+      return udp_sender_.size ();
+    }
 
-      void Filter::
-      add_source (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        source_.push_back (e);
-      }
+    // EventServiceDescription
+    // 
+    EventServiceDescription::udp_receiver_iterator EventServiceDescription::
+    begin_udp_receiver ()
+    {
+      return udp_receiver_.begin ();
+    }
 
-      size_t Filter::
-      count_source(void) const
-      {
-        return source_.size ();
-      }
+    EventServiceDescription::udp_receiver_iterator EventServiceDescription::
+    end_udp_receiver ()
+    {
+      return udp_receiver_.end ();
+    }
 
-      // Filter
-      //
-      bool Filter::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
+    EventServiceDescription::udp_receiver_const_iterator EventServiceDescription::
+    begin_udp_receiver () const
+    {
+      return udp_receiver_.begin ();
+    }
 
-      ::XMLSchema::ID< ACE_TCHAR > const& Filter::
-      id () const
-      {
-        return *id_;
-      }
+    EventServiceDescription::udp_receiver_const_iterator EventServiceDescription::
+    end_udp_receiver () const
+    {
+      return udp_receiver_.end ();
+    }
 
-      ::XMLSchema::ID< ACE_TCHAR >& Filter::
-      id ()
-      {
-        return *id_;
-      }
+    void EventServiceDescription::
+    add_udp_receiver (::CIAO::Config_Handlers::UDPReceiverDescription const& e)
+    {
+      udp_receiver_.push_back (e);
+    }
 
-      void Filter::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
+    size_t EventServiceDescription::
+    count_udp_receiver(void) const
+    {
+      return udp_receiver_.size ();
+    }
 
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
+    // EventServiceDescription
+    // 
+    bool EventServiceDescription::
+    id_p () const
+    {
+      return id_.get () != 0;
+    }
 
+    ::XMLSchema::ID< ACE_TCHAR > const& EventServiceDescription::
+    id () const
+    {
+      return *id_;
+    }
 
-      // MCastSenderDescription
-      //
+    ::XMLSchema::ID< ACE_TCHAR >& EventServiceDescription::
+    id ()
+    {
+      return *id_;
+    }
 
-      MCastSenderDescription::
-      MCastSenderDescription (::XMLSchema::string< ACE_TCHAR > const& node__,
-                              ::CIAO::Config_Handlers::EventServiceType const& type__,
-                              ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__)
-      :
-      ::XSCRT::Type (),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (type__)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (svc_cfg_file__)),
-      regulator__ ()
+    void EventServiceDescription::
+    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    {
+      if (id_.get ())
       {
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
+        *id_ = e;
       }
 
-      MCastSenderDescription::
-      MCastSenderDescription (::CIAO::Config_Handlers::MCastSenderDescription const& s)
-      :
-      ::XSCRT::Type (),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (*s.type_)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (*s.svc_cfg_file_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
+      else
       {
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
-        if (id_.get ()) id_->container (this);
+        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        id_->container (this);
       }
+    }
 
-      ::CIAO::Config_Handlers::MCastSenderDescription& MCastSenderDescription::
-      operator= (::CIAO::Config_Handlers::MCastSenderDescription const& s)
-      {
-        node (s.node ());
 
-        type (s.type ());
+    // FilterType
+    // 
 
-        svc_cfg_file (s.svc_cfg_file ());
+    FilterType::Value FilterType::
+    integral () const
+    {
+      return v_;
+    }
 
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+    bool
+    operator== (::CIAO::Config_Handlers::FilterType const& a, ::CIAO::Config_Handlers::FilterType const& b)
+    {
+      return a.v_ == b.v_;
+    }
 
-        return *this;
-      }
+    bool
+    operator!= (::CIAO::Config_Handlers::FilterType const& a, ::CIAO::Config_Handlers::FilterType const& b)
+    {
+      return a.v_ != b.v_;
+    }
 
+    FilterType::
+    FilterType (FilterType::Value v)
+    : v_ (v)
+    {
+    }
 
-      // MCastSenderDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastSenderDescription::
-      node () const
-      {
-        return *node_;
-      }
+    // Filter
+    // 
+
+    Filter::
+    Filter (::XMLSchema::string< ACE_TCHAR > const& name__,
+            ::CIAO::Config_Handlers::FilterType const& type__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    type_ (new ::CIAO::Config_Handlers::FilterType (type__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      type_->container (this);
+    }
 
-      void MCastSenderDescription::
-      node (::XMLSchema::string< ACE_TCHAR > const& e)
+    Filter::
+    Filter (::CIAO::Config_Handlers::Filter const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    type_ (new ::CIAO::Config_Handlers::FilterType (*s.type_)),
+    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    regulator__ ()
+    {
+      name_->container (this);
+      type_->container (this);
       {
-        *node_ = e;
+        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
       }
 
-      // MCastSenderDescription
-      //
-      ::CIAO::Config_Handlers::EventServiceType const& MCastSenderDescription::
-      type () const
-      {
-        return *type_;
-      }
+      if (id_.get ()) id_->container (this);
+    }
 
-      void MCastSenderDescription::
-      type (::CIAO::Config_Handlers::EventServiceType const& e)
-      {
-        *type_ = e;
-      }
+    ::CIAO::Config_Handlers::Filter& Filter::
+    operator= (::CIAO::Config_Handlers::Filter const& s)
+    {
+      name (s.name ());
 
-      // MCastSenderDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastSenderDescription::
-      svc_cfg_file () const
-      {
-        return *svc_cfg_file_;
-      }
+      type (s.type ());
 
-      void MCastSenderDescription::
-      svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& e)
+      source_.clear ();
       {
-        *svc_cfg_file_ = e;
+        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
       }
 
-      // MCastSenderDescription
-      //
-      bool MCastSenderDescription::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
+      if (s.id_.get ()) id (*(s.id_));
+      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-      ::XMLSchema::ID< ACE_TCHAR > const& MCastSenderDescription::
-      id () const
-      {
-        return *id_;
-      }
+      return *this;
+    }
 
-      ::XMLSchema::ID< ACE_TCHAR >& MCastSenderDescription::
-      id ()
-      {
-        return *id_;
-      }
 
-      void MCastSenderDescription::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
+    // Filter
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& Filter::
+    name () const
+    {
+      return *name_;
+    }
 
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
+    void Filter::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
+    // Filter
+    // 
+    ::CIAO::Config_Handlers::FilterType const& Filter::
+    type () const
+    {
+      return *type_;
+    }
 
-      // MCastReceiverDescription
-      //
+    void Filter::
+    type (::CIAO::Config_Handlers::FilterType const& e)
+    {
+      *type_ = e;
+    }
 
-      MCastReceiverDescription::
-      MCastReceiverDescription (::XMLSchema::string< ACE_TCHAR > const& node__,
-                                ::CIAO::Config_Handlers::EventServiceType const& type__,
-                                ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__)
-      :
-      ::XSCRT::Type (),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (type__)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (svc_cfg_file__)),
-      regulator__ ()
-      {
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
-      }
+    // Filter
+    // 
+    Filter::source_iterator Filter::
+    begin_source ()
+    {
+      return source_.begin ();
+    }
 
-      MCastReceiverDescription::
-      MCastReceiverDescription (::CIAO::Config_Handlers::MCastReceiverDescription const& s)
-      :
-      ::XSCRT::Type (),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (*s.type_)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (*s.svc_cfg_file_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
-        if (id_.get ()) id_->container (this);
-      }
+    Filter::source_iterator Filter::
+    end_source ()
+    {
+      return source_.end ();
+    }
 
-      ::CIAO::Config_Handlers::MCastReceiverDescription& MCastReceiverDescription::
-      operator= (::CIAO::Config_Handlers::MCastReceiverDescription const& s)
-      {
-        node (s.node ());
+    Filter::source_const_iterator Filter::
+    begin_source () const
+    {
+      return source_.begin ();
+    }
 
-        type (s.type ());
+    Filter::source_const_iterator Filter::
+    end_source () const
+    {
+      return source_.end ();
+    }
 
-        svc_cfg_file (s.svc_cfg_file ());
+    void Filter::
+    add_source (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      source_.push_back (e);
+    }
 
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+    size_t Filter::
+    count_source(void) const
+    {
+      return source_.size ();
+    }
 
-        return *this;
-      }
+    // Filter
+    // 
+    bool Filter::
+    id_p () const
+    {
+      return id_.get () != 0;
+    }
 
+    ::XMLSchema::ID< ACE_TCHAR > const& Filter::
+    id () const
+    {
+      return *id_;
+    }
 
-      // MCastReceiverDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastReceiverDescription::
-      node () const
-      {
-        return *node_;
-      }
+    ::XMLSchema::ID< ACE_TCHAR >& Filter::
+    id ()
+    {
+      return *id_;
+    }
 
-      void MCastReceiverDescription::
-      node (::XMLSchema::string< ACE_TCHAR > const& e)
+    void Filter::
+    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    {
+      if (id_.get ())
       {
-        *node_ = e;
+        *id_ = e;
       }
 
-      // MCastReceiverDescription
-      //
-      ::CIAO::Config_Handlers::EventServiceType const& MCastReceiverDescription::
-      type () const
+      else
       {
-        return *type_;
+        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        id_->container (this);
       }
+    }
 
-      void MCastReceiverDescription::
-      type (::CIAO::Config_Handlers::EventServiceType const& e)
-      {
-        *type_ = e;
-      }
 
-      // MCastReceiverDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastReceiverDescription::
-      svc_cfg_file () const
-      {
-        return *svc_cfg_file_;
-      }
+    // AddressServerDescription
+    // 
+
+    AddressServerDescription::
+    AddressServerDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                              ::XMLSchema::unsignedShort const& port__,
+                              ::XMLSchema::string< ACE_TCHAR > const& address__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    port_ (new ::XMLSchema::unsignedShort (port__)),
+    address_ (new ::XMLSchema::string< ACE_TCHAR > (address__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      port_->container (this);
+      address_->container (this);
+    }
 
-      void MCastReceiverDescription::
-      svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *svc_cfg_file_ = e;
-      }
+    AddressServerDescription::
+    AddressServerDescription (::CIAO::Config_Handlers::AddressServerDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    port_ (new ::XMLSchema::unsignedShort (*s.port_)),
+    address_ (new ::XMLSchema::string< ACE_TCHAR > (*s.address_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      port_->container (this);
+      address_->container (this);
+    }
 
-      // MCastReceiverDescription
-      //
-      bool MCastReceiverDescription::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
+    ::CIAO::Config_Handlers::AddressServerDescription& AddressServerDescription::
+    operator= (::CIAO::Config_Handlers::AddressServerDescription const& s)
+    {
+      name (s.name ());
 
-      ::XMLSchema::ID< ACE_TCHAR > const& MCastReceiverDescription::
-      id () const
-      {
-        return *id_;
-      }
+      port (s.port ());
 
-      ::XMLSchema::ID< ACE_TCHAR >& MCastReceiverDescription::
-      id ()
-      {
-        return *id_;
-      }
+      address (s.address ());
 
-      void MCastReceiverDescription::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
+      return *this;
+    }
 
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
 
+    // AddressServerDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& AddressServerDescription::
+    name () const
+    {
+      return *name_;
+    }
 
-      // EC_to_MCastSender
-      //
+    void AddressServerDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-      EC_to_MCastSender::
-      EC_to_MCastSender (::XMLSchema::string< ACE_TCHAR > const& destination__)
-      :
-      ::XSCRT::Type (),
-      destination_ (new ::XMLSchema::string< ACE_TCHAR > (destination__)),
-      regulator__ ()
-      {
-        destination_->container (this);
-      }
+    // AddressServerDescription
+    // 
+    ::XMLSchema::unsignedShort const& AddressServerDescription::
+    port () const
+    {
+      return *port_;
+    }
 
-      EC_to_MCastSender::
-      EC_to_MCastSender (::CIAO::Config_Handlers::EC_to_MCastSender const& s)
-      :
-      ::XSCRT::Type (),
-      destination_ (new ::XMLSchema::string< ACE_TCHAR > (*s.destination_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        destination_->container (this);
-        if (id_.get ()) id_->container (this);
-      }
+    void AddressServerDescription::
+    port (::XMLSchema::unsignedShort const& e)
+    {
+      *port_ = e;
+    }
 
-      ::CIAO::Config_Handlers::EC_to_MCastSender& EC_to_MCastSender::
-      operator= (::CIAO::Config_Handlers::EC_to_MCastSender const& s)
-      {
-        destination (s.destination ());
+    // AddressServerDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& AddressServerDescription::
+    address () const
+    {
+      return *address_;
+    }
 
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+    void AddressServerDescription::
+    address (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *address_ = e;
+    }
 
-        return *this;
-      }
 
+    // UDPSenderDescription
+    // 
+
+    UDPSenderDescription::
+    UDPSenderDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                          ::XMLSchema::string< ACE_TCHAR > const& addr_serv_id__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    addr_serv_id_ (new ::XMLSchema::string< ACE_TCHAR > (addr_serv_id__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      addr_serv_id_->container (this);
+    }
 
-      // EC_to_MCastSender
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& EC_to_MCastSender::
-      destination () const
-      {
-        return *destination_;
-      }
+    UDPSenderDescription::
+    UDPSenderDescription (::CIAO::Config_Handlers::UDPSenderDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    addr_serv_id_ (new ::XMLSchema::string< ACE_TCHAR > (*s.addr_serv_id_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      addr_serv_id_->container (this);
+    }
 
-      void EC_to_MCastSender::
-      destination (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *destination_ = e;
-      }
+    ::CIAO::Config_Handlers::UDPSenderDescription& UDPSenderDescription::
+    operator= (::CIAO::Config_Handlers::UDPSenderDescription const& s)
+    {
+      name (s.name ());
 
-      // EC_to_MCastSender
-      //
-      bool EC_to_MCastSender::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
+      addr_serv_id (s.addr_serv_id ());
 
-      ::XMLSchema::ID< ACE_TCHAR > const& EC_to_MCastSender::
-      id () const
-      {
-        return *id_;
-      }
+      return *this;
+    }
 
-      ::XMLSchema::ID< ACE_TCHAR >& EC_to_MCastSender::
-      id ()
-      {
-        return *id_;
-      }
 
-      void EC_to_MCastSender::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
+    // UDPSenderDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& UDPSenderDescription::
+    name () const
+    {
+      return *name_;
+    }
 
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
+    void UDPSenderDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
+    // UDPSenderDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& UDPSenderDescription::
+    addr_serv_id () const
+    {
+      return *addr_serv_id_;
+    }
 
-      // MCastReceiver_to_EC
-      //
+    void UDPSenderDescription::
+    addr_serv_id (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *addr_serv_id_ = e;
+    }
 
-      MCastReceiver_to_EC::
-      MCastReceiver_to_EC (::XMLSchema::string< ACE_TCHAR > const& source__,
-                           ::XMLSchema::string< ACE_TCHAR > const& destination__)
-      :
-      ::XSCRT::Type (),
-      source_ (new ::XMLSchema::string< ACE_TCHAR > (source__)),
-      destination_ (new ::XMLSchema::string< ACE_TCHAR > (destination__)),
-      regulator__ ()
-      {
-        source_->container (this);
-        destination_->container (this);
-      }
 
-      MCastReceiver_to_EC::
-      MCastReceiver_to_EC (::CIAO::Config_Handlers::MCastReceiver_to_EC const& s)
-      :
-      ::XSCRT::Type (),
-      source_ (new ::XMLSchema::string< ACE_TCHAR > (*s.source_)),
-      destination_ (new ::XMLSchema::string< ACE_TCHAR > (*s.destination_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        source_->container (this);
-        destination_->container (this);
-        if (id_.get ()) id_->container (this);
-      }
+    // UDPReceiverDescription
+    // 
+
+    UDPReceiverDescription::
+    UDPReceiverDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                            ::XMLSchema::boolean const& is_multicast__,
+                            ::XMLSchema::unsignedShort const& listen_port__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    is_multicast_ (new ::XMLSchema::boolean (is_multicast__)),
+    listen_port_ (new ::XMLSchema::unsignedShort (listen_port__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      is_multicast_->container (this);
+      listen_port_->container (this);
+    }
 
-      ::CIAO::Config_Handlers::MCastReceiver_to_EC& MCastReceiver_to_EC::
-      operator= (::CIAO::Config_Handlers::MCastReceiver_to_EC const& s)
-      {
-        source (s.source ());
+    UDPReceiverDescription::
+    UDPReceiverDescription (::CIAO::Config_Handlers::UDPReceiverDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    addr_serv_id_ (s.addr_serv_id_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.addr_serv_id_) : 0),
+    is_multicast_ (new ::XMLSchema::boolean (*s.is_multicast_)),
+    listen_port_ (new ::XMLSchema::unsignedShort (*s.listen_port_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      if (addr_serv_id_.get ()) addr_serv_id_->container (this);
+      is_multicast_->container (this);
+      listen_port_->container (this);
+    }
 
-        destination (s.destination ());
+    ::CIAO::Config_Handlers::UDPReceiverDescription& UDPReceiverDescription::
+    operator= (::CIAO::Config_Handlers::UDPReceiverDescription const& s)
+    {
+      name (s.name ());
 
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+      if (s.addr_serv_id_.get ()) addr_serv_id (*(s.addr_serv_id_));
+      else addr_serv_id_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-        return *this;
-      }
+      is_multicast (s.is_multicast ());
 
+      listen_port (s.listen_port ());
 
-      // MCastReceiver_to_EC
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastReceiver_to_EC::
-      source () const
-      {
-        return *source_;
-      }
+      return *this;
+    }
 
-      void MCastReceiver_to_EC::
-      source (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *source_ = e;
-      }
 
-      // MCastReceiver_to_EC
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastReceiver_to_EC::
-      destination () const
-      {
-        return *destination_;
-      }
+    // UDPReceiverDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& UDPReceiverDescription::
+    name () const
+    {
+      return *name_;
+    }
 
-      void MCastReceiver_to_EC::
-      destination (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *destination_ = e;
-      }
+    void UDPReceiverDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-      // MCastReceiver_to_EC
-      //
-      bool MCastReceiver_to_EC::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
+    // UDPReceiverDescription
+    // 
+    bool UDPReceiverDescription::
+    addr_serv_id_p () const
+    {
+      return addr_serv_id_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& UDPReceiverDescription::
+    addr_serv_id () const
+    {
+      return *addr_serv_id_;
+    }
 
-      ::XMLSchema::ID< ACE_TCHAR > const& MCastReceiver_to_EC::
-      id () const
+    void UDPReceiverDescription::
+    addr_serv_id (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (addr_serv_id_.get ())
       {
-        return *id_;
+        *addr_serv_id_ = e;
       }
 
-      ::XMLSchema::ID< ACE_TCHAR >& MCastReceiver_to_EC::
-      id ()
+      else
       {
-        return *id_;
+        addr_serv_id_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        addr_serv_id_->container (this);
       }
+    }
 
-      void MCastReceiver_to_EC::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
+    // UDPReceiverDescription
+    // 
+    ::XMLSchema::boolean const& UDPReceiverDescription::
+    is_multicast () const
+    {
+      return *is_multicast_;
+    }
 
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
+    void UDPReceiverDescription::
+    is_multicast (::XMLSchema::boolean const& e)
+    {
+      *is_multicast_ = e;
     }
 
+    // UDPReceiverDescription
+    // 
+    ::XMLSchema::unsignedShort const& UDPReceiverDescription::
+    listen_port () const
+    {
+      return *listen_port_;
+    }
+
+    void UDPReceiverDescription::
+    listen_port (::XMLSchema::unsignedShort const& e)
+    {
+      *listen_port_ = e;
+    }
+  }
 }
 
 namespace CIAO
 {
   namespace Config_Handlers
   {
+    // EventServiceType
+    //
 
-      // EventServiceType
-      //
+    EventServiceType::
+    EventServiceType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    : ::XSCRT::Type (e)
+    {
+      ::std::basic_string< ACE_TCHAR > v (e.value ());
 
-      EventServiceType::
-      EventServiceType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      : ::XSCRT::Type (e)
+      if (v == "EC") v_ = EC_l;
+      else if (v == "RTEC") v_ = RTEC_l;
+      else if (v == "NOTIFY") v_ = NOTIFY_l;
+      else if (v == "RTNOTIFY") v_ = RTNOTIFY_l;
+      else 
       {
-        ::std::basic_string< ACE_TCHAR > v (e.value ());
-
-        if (v == "EC") v_ = EC_l;
-        else if (v == "RTEC") v_ = RTEC_l;
-        else if (v == "NOTIFY") v_ = NOTIFY_l;
-        else if (v == "RTNOTIFY") v_ = RTNOTIFY_l;
-        else
-        {
-        }
       }
+    }
 
-      EventServiceType::
-      EventServiceType (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-      : ::XSCRT::Type (a)
-      {
-        ::std::basic_string< ACE_TCHAR > v (a.value ());
+    EventServiceType::
+    EventServiceType (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+    : ::XSCRT::Type (a)
+    {
+      ::std::basic_string< ACE_TCHAR > v (a.value ());
 
-        if (v == "EC") v_ = EC_l;
-        else if (v == "RTEC") v_ = RTEC_l;
-        else if (v == "NOTIFY") v_ = NOTIFY_l;
-        else if (v == "RTNOTIFY") v_ = RTNOTIFY_l;
-        else
-        {
-        }
+      if (v == "EC") v_ = EC_l;
+      else if (v == "RTEC") v_ = RTEC_l;
+      else if (v == "NOTIFY") v_ = NOTIFY_l;
+      else if (v == "RTNOTIFY") v_ = RTNOTIFY_l;
+      else 
+      {
       }
+    }
 
-      EventServiceType const EventServiceType::EC (EventServiceType::EC_l);
-      EventServiceType const EventServiceType::RTEC (EventServiceType::RTEC_l);
-      EventServiceType const EventServiceType::NOTIFY (EventServiceType::NOTIFY_l);
-      EventServiceType const EventServiceType::RTNOTIFY (EventServiceType::RTNOTIFY_l);
+    EventServiceType const EventServiceType::EC (EventServiceType::EC_l);
+    EventServiceType const EventServiceType::RTEC (EventServiceType::RTEC_l);
+    EventServiceType const EventServiceType::NOTIFY (EventServiceType::NOTIFY_l);
+    EventServiceType const EventServiceType::RTNOTIFY (EventServiceType::RTNOTIFY_l);
 
-      // CIAOEventsDef
-      //
+    // CIAOEventsDef
+    //
 
-      CIAOEventsDef::
-      CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
-      {
+    CIAOEventsDef::
+    CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base__ (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        ::XSCRT::Parser< ACE_TCHAR > p (e);
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        while (p.more_elements ())
+        if (n == "eventServiceConfiguration")
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "eventServiceConfiguration")
-          {
-            ::CIAO::Config_Handlers::EventServiceDescription t (e);
-            add_eventServiceConfiguration (t);
-          }
-
-          else
-          {
-          }
+          ::CIAO::Config_Handlers::EventServiceDescription t (e);
+          add_eventServiceConfiguration (t);
         }
 
-        while (p.more_attributes ())
+        else 
         {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-          if (n == "id")
-          {
-            ::XMLSchema::ID< ACE_TCHAR > t (a);
-            id (t);
-          }
-
-          else
-          {
-          }
         }
       }
 
-      // EventServiceDescription
-      //
-
-      EventServiceDescription::
-      EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
+      while (p.more_attributes ())
       {
-
-        ::XSCRT::Parser< ACE_TCHAR > p (e);
-
-        while (p.more_elements ())
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "id")
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "name")
-          {
-            name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            name_->container (this);
-          }
-
-          else if (n == "node")
-          {
-            node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            node_->container (this);
-          }
-
-          else if (n == "type")
-          {
-            type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > (new ::CIAO::Config_Handlers::EventServiceType (e));
-            type_->container (this);
-          }
-
-          else if (n == "svc_cfg_file")
-          {
-            svc_cfg_file_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            svc_cfg_file_->container (this);
-          }
-
-          else if (n == "filter")
-          {
-            ::CIAO::Config_Handlers::Filter t (e);
-            add_filter (t);
-          }
-
-          else
-          {
-          }
+          ::XMLSchema::ID< ACE_TCHAR > t (a);
+          id (t);
         }
 
-        while (p.more_attributes ())
+        else 
         {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-          if (n == "id")
-          {
-            ::XMLSchema::ID< ACE_TCHAR > t (a);
-            id (t);
-          }
-
-          else
-          {
-          }
         }
       }
+    }
 
-      // FilterType
-      //
+    // EventServiceDescription
+    //
 
-      FilterType::
-      FilterType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      : ::XSCRT::Type (e)
-      {
-        ::std::basic_string< ACE_TCHAR > v (e.value ());
+    EventServiceDescription::
+    EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base__ (e), regulator__ ()
+    {
 
-        if (v == "CONJUNCTION") v_ = CONJUNCTION_l;
-        else if (v == "DISJUNCTION") v_ = DISJUNCTION_l;
-        else if (v == "LOGICAL_AND") v_ = LOGICAL_AND_l;
-        else if (v == "NEGATE") v_ = NEGATE_l;
-        else
-        {
-        }
-      }
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      FilterType::
-      FilterType (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-      : ::XSCRT::Type (a)
+      while (p.more_elements ())
       {
-        ::std::basic_string< ACE_TCHAR > v (a.value ());
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (v == "CONJUNCTION") v_ = CONJUNCTION_l;
-        else if (v == "DISJUNCTION") v_ = DISJUNCTION_l;
-        else if (v == "LOGICAL_AND") v_ = LOGICAL_AND_l;
-        else if (v == "NEGATE") v_ = NEGATE_l;
-        else
+        if (n == "name")
         {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
         }
-      }
-
-      FilterType const FilterType::CONJUNCTION (FilterType::CONJUNCTION_l);
-      FilterType const FilterType::DISJUNCTION (FilterType::DISJUNCTION_l);
-      FilterType const FilterType::LOGICAL_AND (FilterType::LOGICAL_AND_l);
-      FilterType const FilterType::NEGATE (FilterType::NEGATE_l);
 
-      // Filter
-      //
-
-      Filter::
-      Filter (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
-      {
-
-        ::XSCRT::Parser< ACE_TCHAR > p (e);
-
-        while (p.more_elements ())
+        else if (n == "node")
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "name")
-          {
-            name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            name_->container (this);
-          }
-
-          else if (n == "type")
-          {
-            type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::FilterType > (new ::CIAO::Config_Handlers::FilterType (e));
-            type_->container (this);
-          }
-
-          else if (n == "source")
-          {
-            ::XMLSchema::string< ACE_TCHAR > t (e);
-            add_source (t);
-          }
-
-          else
-          {
-          }
+          node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          node_->container (this);
         }
 
-        while (p.more_attributes ())
+        else if (n == "type")
         {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-          if (n == "id")
-          {
-            ::XMLSchema::ID< ACE_TCHAR > t (a);
-            id (t);
-          }
-
-          else
-          {
-          }
+          type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > (new ::CIAO::Config_Handlers::EventServiceType (e));
+          type_->container (this);
         }
-      }
-
-      // MCastSenderDescription
-      //
-
-      MCastSenderDescription::
-      MCastSenderDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
-      {
-
-        ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        while (p.more_elements ())
+        else if (n == "svc_cfg_file")
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "node")
-          {
-            node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            node_->container (this);
-          }
-
-          else if (n == "type")
-          {
-            type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > (new ::CIAO::Config_Handlers::EventServiceType (e));
-            type_->container (this);
-          }
-
-          else if (n == "svc_cfg_file")
-          {
-            svc_cfg_file_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            svc_cfg_file_->container (this);
-          }
-
-          else
-          {
-          }
+          svc_cfg_file_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          svc_cfg_file_->container (this);
         }
 
-        while (p.more_attributes ())
+        else if (n == "filter")
         {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-          if (n == "id")
-          {
-            ::XMLSchema::ID< ACE_TCHAR > t (a);
-            id (t);
-          }
-
-          else
-          {
-          }
+          ::CIAO::Config_Handlers::Filter t (e);
+          add_filter (t);
         }
-      }
-
-      // MCastReceiverDescription
-      //
-
-      MCastReceiverDescription::
-      MCastReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
-      {
 
-        ::XSCRT::Parser< ACE_TCHAR > p (e);
-
-        while (p.more_elements ())
+        else if (n == "addr_serv")
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "node")
-          {
-            node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            node_->container (this);
-          }
-
-          else if (n == "type")
-          {
-            type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > (new ::CIAO::Config_Handlers::EventServiceType (e));
-            type_->container (this);
-          }
-
-          else if (n == "svc_cfg_file")
-          {
-            svc_cfg_file_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            svc_cfg_file_->container (this);
-          }
-
-          else
-          {
-          }
+          ::CIAO::Config_Handlers::AddressServerDescription t (e);
+          add_addr_serv (t);
         }
 
-        while (p.more_attributes ())
+        else if (n == "udp_sender")
         {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-          if (n == "id")
-          {
-            ::XMLSchema::ID< ACE_TCHAR > t (a);
-            id (t);
-          }
-
-          else
-          {
-          }
+          ::CIAO::Config_Handlers::UDPSenderDescription t (e);
+          add_udp_sender (t);
         }
-      }
 
-      // EC_to_MCastSender
-      //
-
-      EC_to_MCastSender::
-      EC_to_MCastSender (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
-      {
-
-        ::XSCRT::Parser< ACE_TCHAR > p (e);
-
-        while (p.more_elements ())
+        else if (n == "udp_receiver")
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "destination")
-          {
-            destination_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            destination_->container (this);
-          }
-
-          else
-          {
-          }
+          ::CIAO::Config_Handlers::UDPReceiverDescription t (e);
+          add_udp_receiver (t);
         }
 
-        while (p.more_attributes ())
+        else 
         {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-          if (n == "id")
-          {
-            ::XMLSchema::ID< ACE_TCHAR > t (a);
-            id (t);
-          }
-
-          else
-          {
-          }
         }
       }
 
-      // MCastReceiver_to_EC
-      //
-
-      MCastReceiver_to_EC::
-      MCastReceiver_to_EC (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
+      while (p.more_attributes ())
       {
-
-        ::XSCRT::Parser< ACE_TCHAR > p (e);
-
-        while (p.more_elements ())
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "id")
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "source")
-          {
-            source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            source_->container (this);
-          }
-
-          else if (n == "destination")
-          {
-            destination_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            destination_->container (this);
-          }
-
-          else
-          {
-          }
+          ::XMLSchema::ID< ACE_TCHAR > t (a);
+          id (t);
         }
 
-        while (p.more_attributes ())
+        else 
         {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-          if (n == "id")
-          {
-            ::XMLSchema::ID< ACE_TCHAR > t (a);
-            id (t);
-          }
-
-          else
-          {
-          }
         }
       }
     }
 
-}
+    // FilterType
+    //
 
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
+    FilterType::
+    FilterType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    : ::XSCRT::Type (e)
+    {
+      ::std::basic_string< ACE_TCHAR > v (e.value ());
 
-      ::CIAO::Config_Handlers::CIAOEventsDef
-      CIAOEvents (xercesc::DOMDocument const* d)
+      if (v == "CONJUNCTION") v_ = CONJUNCTION_l;
+      else if (v == "DISJUNCTION") v_ = DISJUNCTION_l;
+      else if (v == "LOGICAL_AND") v_ = LOGICAL_AND_l;
+      else if (v == "NEGATE") v_ = NEGATE_l;
+      else 
       {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-        if (e.name () == "CIAOEvents")
-        {
-          ::CIAO::Config_Handlers::CIAOEventsDef r (e);
-          return r;
-        }
-
-        else
-        {
-          throw 1;
-        }
       }
     }
 
-}
-
-#include "XMLSchema/TypeInfo.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
+    FilterType::
+    FilterType (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+    : ::XSCRT::Type (a)
+    {
+      ::std::basic_string< ACE_TCHAR > v (a.value ());
 
-      namespace
+      if (v == "CONJUNCTION") v_ = CONJUNCTION_l;
+      else if (v == "DISJUNCTION") v_ = DISJUNCTION_l;
+      else if (v == "LOGICAL_AND") v_ = LOGICAL_AND_l;
+      else if (v == "NEGATE") v_ = NEGATE_l;
+      else 
       {
-        ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-        struct EventServiceTypeTypeInfoInitializer
-        {
-          EventServiceTypeTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (EventServiceType));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        EventServiceTypeTypeInfoInitializer EventServiceTypeTypeInfoInitializer_;
-
-        struct CIAOEventsDefTypeInfoInitializer
-        {
-          CIAOEventsDefTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (CIAOEventsDef));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        CIAOEventsDefTypeInfoInitializer CIAOEventsDefTypeInfoInitializer_;
-
-        struct EventServiceDescriptionTypeInfoInitializer
-        {
-          EventServiceDescriptionTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (EventServiceDescription));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        EventServiceDescriptionTypeInfoInitializer EventServiceDescriptionTypeInfoInitializer_;
-
-        struct FilterTypeTypeInfoInitializer
-        {
-          FilterTypeTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (FilterType));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        FilterTypeTypeInfoInitializer FilterTypeTypeInfoInitializer_;
-
-        struct FilterTypeInfoInitializer
-        {
-          FilterTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (Filter));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        FilterTypeInfoInitializer FilterTypeInfoInitializer_;
-
-        struct MCastSenderDescriptionTypeInfoInitializer
-        {
-          MCastSenderDescriptionTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (MCastSenderDescription));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        MCastSenderDescriptionTypeInfoInitializer MCastSenderDescriptionTypeInfoInitializer_;
-
-        struct MCastReceiverDescriptionTypeInfoInitializer
-        {
-          MCastReceiverDescriptionTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (MCastReceiverDescription));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        MCastReceiverDescriptionTypeInfoInitializer MCastReceiverDescriptionTypeInfoInitializer_;
-
-        struct EC_to_MCastSenderTypeInfoInitializer
-        {
-          EC_to_MCastSenderTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (EC_to_MCastSender));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        EC_to_MCastSenderTypeInfoInitializer EC_to_MCastSenderTypeInfoInitializer_;
-
-        struct MCastReceiver_to_ECTypeInfoInitializer
-        {
-          MCastReceiver_to_ECTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (MCastReceiver_to_EC));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        MCastReceiver_to_ECTypeInfoInitializer MCastReceiver_to_ECTypeInfoInitializer_;
       }
     }
 
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-
-      namespace Traversal
-      {
-        // CIAOEventsDef
-        //
-        //
-
-        void CIAOEventsDef::
-        traverse (Type& o)
-        {
-          pre (o);
-          eventServiceConfiguration (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void CIAOEventsDef::
-        traverse (Type const& o)
-        {
-          pre (o);
-          eventServiceConfiguration (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void CIAOEventsDef::
-        pre (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        pre (Type const&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration (Type& o)
-        {
-          // VC6 anathema strikes again
-          //
-          CIAOEventsDef::Type::eventServiceConfiguration_iterator b (o.begin_eventServiceConfiguration()), e (o.end_eventServiceConfiguration());
-
-          if (b != e)
-          {
-            eventServiceConfiguration_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) eventServiceConfiguration_next (o);
-            }
-
-            eventServiceConfiguration_post (o);
-          }
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration (Type const& o)
-        {
-          // VC6 anathema strikes again
-          //
-          CIAOEventsDef::Type::eventServiceConfiguration_const_iterator b (o.begin_eventServiceConfiguration()), e (o.end_eventServiceConfiguration());
-
-          if (b != e)
-          {
-            eventServiceConfiguration_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) eventServiceConfiguration_next (o);
-            }
-
-            eventServiceConfiguration_post (o);
-          }
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_pre (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_pre (Type const&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_next (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_next (Type const&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_post (Type&)
-        {
-        }
+    FilterType const FilterType::CONJUNCTION (FilterType::CONJUNCTION_l);
+    FilterType const FilterType::DISJUNCTION (FilterType::DISJUNCTION_l);
+    FilterType const FilterType::LOGICAL_AND (FilterType::LOGICAL_AND_l);
+    FilterType const FilterType::NEGATE (FilterType::NEGATE_l);
 
-        void CIAOEventsDef::
-        eventServiceConfiguration_post (Type const&)
-        {
-        }
+    // Filter
+    //
 
-        void CIAOEventsDef::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
+    Filter::
+    Filter (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base__ (e), regulator__ ()
+    {
 
-        void CIAOEventsDef::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        void CIAOEventsDef::
-        id_none (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        id_none (Type const&)
-        {
-        }
-
-        void CIAOEventsDef::
-        post (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        post (Type const&)
-        {
-        }
-
-        // EventServiceDescription
-        //
-        //
-
-        void EventServiceDescription::
-        traverse (Type& o)
-        {
-          pre (o);
-          name (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          filter (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void EventServiceDescription::
-        traverse (Type const& o)
-        {
-          pre (o);
-          name (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          filter (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void EventServiceDescription::
-        pre (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        pre (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        name (Type& o)
-        {
-          dispatch (o.name ());
-        }
-
-        void EventServiceDescription::
-        name (Type const& o)
-        {
-          dispatch (o.name ());
-        }
-
-        void EventServiceDescription::
-        node (Type& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void EventServiceDescription::
-        node (Type const& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void EventServiceDescription::
-        type (Type& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void EventServiceDescription::
-        type (Type const& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void EventServiceDescription::
-        svc_cfg_file (Type& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void EventServiceDescription::
-        svc_cfg_file (Type const& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void EventServiceDescription::
-        filter (Type& o)
-        {
-          // VC6 anathema strikes again
-          //
-          EventServiceDescription::Type::filter_iterator b (o.begin_filter()), e (o.end_filter());
-
-          if (b != e)
-          {
-            filter_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) filter_next (o);
-            }
-
-            filter_post (o);
-          }
-
-          else filter_none (o);
-        }
-
-        void EventServiceDescription::
-        filter (Type const& o)
-        {
-          // VC6 anathema strikes again
-          //
-          EventServiceDescription::Type::filter_const_iterator b (o.begin_filter()), e (o.end_filter());
-
-          if (b != e)
-          {
-            filter_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) filter_next (o);
-            }
-
-            filter_post (o);
-          }
-
-          else filter_none (o);
-        }
-
-        void EventServiceDescription::
-        filter_pre (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_pre (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_next (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_next (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_post (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_post (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_none (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_none (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void EventServiceDescription::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void EventServiceDescription::
-        id_none (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        id_none (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        post (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        post (Type const&)
-        {
-        }
-
-        // Filter
-        //
-        //
-
-        void Filter::
-        traverse (Type& o)
-        {
-          pre (o);
-          name (o);
-          type (o);
-          source (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void Filter::
-        traverse (Type const& o)
-        {
-          pre (o);
-          name (o);
-          type (o);
-          source (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void Filter::
-        pre (Type&)
-        {
-        }
-
-        void Filter::
-        pre (Type const&)
-        {
-        }
-
-        void Filter::
-        name (Type& o)
-        {
-          dispatch (o.name ());
-        }
-
-        void Filter::
-        name (Type const& o)
-        {
-          dispatch (o.name ());
-        }
-
-        void Filter::
-        type (Type& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void Filter::
-        type (Type const& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void Filter::
-        source (Type& o)
-        {
-          // VC6 anathema strikes again
-          //
-          Filter::Type::source_iterator b (o.begin_source()), e (o.end_source());
-
-          if (b != e)
-          {
-            source_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) source_next (o);
-            }
-
-            source_post (o);
-          }
-        }
-
-        void Filter::
-        source (Type const& o)
-        {
-          // VC6 anathema strikes again
-          //
-          Filter::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
-
-          if (b != e)
-          {
-            source_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) source_next (o);
-            }
-
-            source_post (o);
-          }
-        }
-
-        void Filter::
-        source_pre (Type&)
-        {
-        }
-
-        void Filter::
-        source_pre (Type const&)
-        {
-        }
-
-        void Filter::
-        source_next (Type&)
-        {
-        }
-
-        void Filter::
-        source_next (Type const&)
-        {
-        }
-
-        void Filter::
-        source_post (Type&)
-        {
-        }
-
-        void Filter::
-        source_post (Type const&)
-        {
-        }
-
-        void Filter::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void Filter::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void Filter::
-        id_none (Type&)
-        {
-        }
-
-        void Filter::
-        id_none (Type const&)
-        {
-        }
-
-        void Filter::
-        post (Type&)
-        {
-        }
-
-        void Filter::
-        post (Type const&)
-        {
-        }
-
-        // MCastSenderDescription
-        //
-        //
-
-        void MCastSenderDescription::
-        traverse (Type& o)
-        {
-          pre (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastSenderDescription::
-        traverse (Type const& o)
-        {
-          pre (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastSenderDescription::
-        pre (Type&)
-        {
-        }
-
-        void MCastSenderDescription::
-        pre (Type const&)
-        {
-        }
-
-        void MCastSenderDescription::
-        node (Type& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void MCastSenderDescription::
-        node (Type const& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void MCastSenderDescription::
-        type (Type& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void MCastSenderDescription::
-        type (Type const& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void MCastSenderDescription::
-        svc_cfg_file (Type& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void MCastSenderDescription::
-        svc_cfg_file (Type const& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void MCastSenderDescription::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastSenderDescription::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastSenderDescription::
-        id_none (Type&)
-        {
-        }
-
-        void MCastSenderDescription::
-        id_none (Type const&)
-        {
-        }
-
-        void MCastSenderDescription::
-        post (Type&)
-        {
-        }
-
-        void MCastSenderDescription::
-        post (Type const&)
-        {
-        }
-
-        // MCastReceiverDescription
-        //
-        //
-
-        void MCastReceiverDescription::
-        traverse (Type& o)
-        {
-          pre (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastReceiverDescription::
-        traverse (Type const& o)
-        {
-          pre (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastReceiverDescription::
-        pre (Type&)
-        {
-        }
-
-        void MCastReceiverDescription::
-        pre (Type const&)
-        {
-        }
-
-        void MCastReceiverDescription::
-        node (Type& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void MCastReceiverDescription::
-        node (Type const& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void MCastReceiverDescription::
-        type (Type& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void MCastReceiverDescription::
-        type (Type const& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void MCastReceiverDescription::
-        svc_cfg_file (Type& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void MCastReceiverDescription::
-        svc_cfg_file (Type const& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void MCastReceiverDescription::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastReceiverDescription::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastReceiverDescription::
-        id_none (Type&)
-        {
-        }
-
-        void MCastReceiverDescription::
-        id_none (Type const&)
-        {
-        }
-
-        void MCastReceiverDescription::
-        post (Type&)
-        {
-        }
-
-        void MCastReceiverDescription::
-        post (Type const&)
-        {
-        }
-
-        // EC_to_MCastSender
-        //
-        //
-
-        void EC_to_MCastSender::
-        traverse (Type& o)
-        {
-          pre (o);
-          destination (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void EC_to_MCastSender::
-        traverse (Type const& o)
-        {
-          pre (o);
-          destination (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void EC_to_MCastSender::
-        pre (Type&)
-        {
-        }
-
-        void EC_to_MCastSender::
-        pre (Type const&)
-        {
-        }
-
-        void EC_to_MCastSender::
-        destination (Type& o)
-        {
-          dispatch (o.destination ());
-        }
-
-        void EC_to_MCastSender::
-        destination (Type const& o)
-        {
-          dispatch (o.destination ());
-        }
-
-        void EC_to_MCastSender::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void EC_to_MCastSender::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void EC_to_MCastSender::
-        id_none (Type&)
-        {
-        }
-
-        void EC_to_MCastSender::
-        id_none (Type const&)
-        {
-        }
-
-        void EC_to_MCastSender::
-        post (Type&)
-        {
-        }
-
-        void EC_to_MCastSender::
-        post (Type const&)
-        {
-        }
-
-        // MCastReceiver_to_EC
-        //
-        //
-
-        void MCastReceiver_to_EC::
-        traverse (Type& o)
-        {
-          pre (o);
-          source (o);
-          destination (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastReceiver_to_EC::
-        traverse (Type const& o)
-        {
-          pre (o);
-          source (o);
-          destination (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastReceiver_to_EC::
-        pre (Type&)
-        {
-        }
-
-        void MCastReceiver_to_EC::
-        pre (Type const&)
-        {
-        }
-
-        void MCastReceiver_to_EC::
-        source (Type& o)
-        {
-          dispatch (o.source ());
-        }
-
-        void MCastReceiver_to_EC::
-        source (Type const& o)
-        {
-          dispatch (o.source ());
-        }
-
-        void MCastReceiver_to_EC::
-        destination (Type& o)
-        {
-          dispatch (o.destination ());
-        }
-
-        void MCastReceiver_to_EC::
-        destination (Type const& o)
-        {
-          dispatch (o.destination ());
-        }
-
-        void MCastReceiver_to_EC::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastReceiver_to_EC::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        void MCastReceiver_to_EC::
-        id_none (Type&)
+        if (n == "name")
         {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
         }
 
-        void MCastReceiver_to_EC::
-        id_none (Type const&)
+        else if (n == "type")
         {
+          type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::FilterType > (new ::CIAO::Config_Handlers::FilterType (e));
+          type_->container (this);
         }
 
-        void MCastReceiver_to_EC::
-        post (Type&)
+        else if (n == "source")
         {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_source (t);
         }
 
-        void MCastReceiver_to_EC::
-        post (Type const&)
+        else 
         {
         }
       }
-    }
-
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
 
-      namespace Writer
+      while (p.more_attributes ())
       {
-        // EventServiceType
-        //
-        //
-
-        EventServiceType::
-        EventServiceType (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        EventServiceType::
-        EventServiceType ()
-        {
-        }
-
-        void EventServiceType::
-        traverse (Type const& o)
-        {
-          ::std::basic_string< ACE_TCHAR > s;
-
-          if (o == ::CIAO::Config_Handlers::EventServiceType::EC) s = "EC";
-          else if (o == ::CIAO::Config_Handlers::EventServiceType::RTEC) s = "RTEC";
-          else if (o == ::CIAO::Config_Handlers::EventServiceType::NOTIFY) s = "NOTIFY";
-          else if (o == ::CIAO::Config_Handlers::EventServiceType::RTNOTIFY) s = "RTNOTIFY";
-          else
-          {
-          }
-
-          if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-          {
-            a->value (s);
-          }
-
-          else
-          {
-            top_().value (s);
-          }
-        }
-
-        // CIAOEventsDef
-        //
-        //
-
-        CIAOEventsDef::
-        CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        CIAOEventsDef::
-        CIAOEventsDef ()
-        {
-        }
-
-        void CIAOEventsDef::
-        traverse (Type const& o)
-        {
-          Traversal::CIAOEventsDef::traverse (o);
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_pre (Type const&)
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "id")
         {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("eventServiceConfiguration", top_ ()));
+          ::XMLSchema::ID< ACE_TCHAR > t (a);
+          id (t);
         }
 
-        void CIAOEventsDef::
-        eventServiceConfiguration_next (Type const& o)
-        {
-          eventServiceConfiguration_post (o);
-          eventServiceConfiguration_pre (o);
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_post (Type const&)
-        {
-          pop_ ();
-        }
-
-        void CIAOEventsDef::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::CIAOEventsDef::id (o);
-          attr_ (0);
-        }
-
-        // EventServiceDescription
-        //
-        //
-
-        EventServiceDescription::
-        EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        EventServiceDescription::
-        EventServiceDescription ()
-        {
-        }
-
-        void EventServiceDescription::
-        traverse (Type const& o)
-        {
-          Traversal::EventServiceDescription::traverse (o);
-        }
-
-        void EventServiceDescription::
-        name (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-          Traversal::EventServiceDescription::name (o);
-          pop_ ();
-        }
-
-        void EventServiceDescription::
-        node (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-          Traversal::EventServiceDescription::node (o);
-          pop_ ();
-        }
-
-        void EventServiceDescription::
-        type (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-          Traversal::EventServiceDescription::type (o);
-          pop_ ();
-        }
-
-        void EventServiceDescription::
-        svc_cfg_file (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("svc_cfg_file", top_ ()));
-          Traversal::EventServiceDescription::svc_cfg_file (o);
-          pop_ ();
-        }
-
-        void EventServiceDescription::
-        filter_pre (Type const&)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("filter", top_ ()));
-        }
-
-        void EventServiceDescription::
-        filter_next (Type const& o)
-        {
-          filter_post (o);
-          filter_pre (o);
-        }
-
-        void EventServiceDescription::
-        filter_post (Type const&)
-        {
-          pop_ ();
-        }
-
-        void EventServiceDescription::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::EventServiceDescription::id (o);
-          attr_ (0);
-        }
-
-        // FilterType
-        //
-        //
-
-        FilterType::
-        FilterType (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        FilterType::
-        FilterType ()
-        {
-        }
-
-        void FilterType::
-        traverse (Type const& o)
-        {
-          ::std::basic_string< ACE_TCHAR > s;
-
-          if (o == ::CIAO::Config_Handlers::FilterType::CONJUNCTION) s = "CONJUNCTION";
-          else if (o == ::CIAO::Config_Handlers::FilterType::DISJUNCTION) s = "DISJUNCTION";
-          else if (o == ::CIAO::Config_Handlers::FilterType::LOGICAL_AND) s = "LOGICAL_AND";
-          else if (o == ::CIAO::Config_Handlers::FilterType::NEGATE) s = "NEGATE";
-          else
-          {
-          }
-
-          if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-          {
-            a->value (s);
-          }
-
-          else
-          {
-            top_().value (s);
-          }
-        }
-
-        // Filter
-        //
-        //
-
-        Filter::
-        Filter (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        Filter::
-        Filter ()
-        {
-        }
-
-        void Filter::
-        traverse (Type const& o)
-        {
-          Traversal::Filter::traverse (o);
-        }
-
-        void Filter::
-        name (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-          Traversal::Filter::name (o);
-          pop_ ();
-        }
-
-        void Filter::
-        type (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-          Traversal::Filter::type (o);
-          pop_ ();
-        }
-
-        void Filter::
-        source_pre (Type const&)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-        }
-
-        void Filter::
-        source_next (Type const& o)
-        {
-          source_post (o);
-          source_pre (o);
-        }
-
-        void Filter::
-        source_post (Type const&)
-        {
-          pop_ ();
-        }
-
-        void Filter::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::Filter::id (o);
-          attr_ (0);
-        }
-
-        // MCastSenderDescription
-        //
-        //
-
-        MCastSenderDescription::
-        MCastSenderDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+        else 
         {
         }
+      }
+    }
 
-        MCastSenderDescription::
-        MCastSenderDescription ()
-        {
-        }
+    // AddressServerDescription
+    //
 
-        void MCastSenderDescription::
-        traverse (Type const& o)
-        {
-          Traversal::MCastSenderDescription::traverse (o);
-        }
+    AddressServerDescription::
+    AddressServerDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base__ (e), regulator__ ()
+    {
 
-        void MCastSenderDescription::
-        node (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-          Traversal::MCastSenderDescription::node (o);
-          pop_ ();
-        }
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        void MCastSenderDescription::
-        type (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-          Traversal::MCastSenderDescription::type (o);
-          pop_ ();
-        }
-
-        void MCastSenderDescription::
-        svc_cfg_file (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("svc_cfg_file", top_ ()));
-          Traversal::MCastSenderDescription::svc_cfg_file (o);
-          pop_ ();
-        }
-
-        void MCastSenderDescription::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::MCastSenderDescription::id (o);
-          attr_ (0);
-        }
-
-        // MCastReceiverDescription
-        //
-        //
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        MCastReceiverDescription::
-        MCastReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+        if (n == "name")
         {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
         }
 
-        MCastReceiverDescription::
-        MCastReceiverDescription ()
+        else if (n == "port")
         {
+          port_ = ::std::auto_ptr< ::XMLSchema::unsignedShort > (new ::XMLSchema::unsignedShort (e));
+          port_->container (this);
         }
 
-        void MCastReceiverDescription::
-        traverse (Type const& o)
+        else if (n == "address")
         {
-          Traversal::MCastReceiverDescription::traverse (o);
+          address_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          address_->container (this);
         }
 
-        void MCastReceiverDescription::
-        node (Type const& o)
+        else 
         {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-          Traversal::MCastReceiverDescription::node (o);
-          pop_ ();
         }
+      }
+    }
 
-        void MCastReceiverDescription::
-        type (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-          Traversal::MCastReceiverDescription::type (o);
-          pop_ ();
-        }
+    // UDPSenderDescription
+    //
 
-        void MCastReceiverDescription::
-        svc_cfg_file (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("svc_cfg_file", top_ ()));
-          Traversal::MCastReceiverDescription::svc_cfg_file (o);
-          pop_ ();
-        }
+    UDPSenderDescription::
+    UDPSenderDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base__ (e), regulator__ ()
+    {
 
-        void MCastReceiverDescription::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::MCastReceiverDescription::id (o);
-          attr_ (0);
-        }
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        // EC_to_MCastSender
-        //
-        //
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        EC_to_MCastSender::
-        EC_to_MCastSender (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+        if (n == "name")
         {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
         }
 
-        EC_to_MCastSender::
-        EC_to_MCastSender ()
+        else if (n == "addr_serv_id")
         {
+          addr_serv_id_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          addr_serv_id_->container (this);
         }
 
-        void EC_to_MCastSender::
-        traverse (Type const& o)
+        else 
         {
-          Traversal::EC_to_MCastSender::traverse (o);
         }
+      }
+    }
 
-        void EC_to_MCastSender::
-        destination (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("destination", top_ ()));
-          Traversal::EC_to_MCastSender::destination (o);
-          pop_ ();
-        }
+    // UDPReceiverDescription
+    //
 
-        void EC_to_MCastSender::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::EC_to_MCastSender::id (o);
-          attr_ (0);
-        }
+    UDPReceiverDescription::
+    UDPReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base__ (e), regulator__ ()
+    {
 
-        // MCastReceiver_to_EC
-        //
-        //
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        MCastReceiver_to_EC::
-        MCastReceiver_to_EC (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        MCastReceiver_to_EC::
-        MCastReceiver_to_EC ()
+        if (n == "name")
         {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
         }
 
-        void MCastReceiver_to_EC::
-        traverse (Type const& o)
+        else if (n == "addr_serv_id")
         {
-          Traversal::MCastReceiver_to_EC::traverse (o);
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          addr_serv_id (t);
         }
 
-        void MCastReceiver_to_EC::
-        source (Type const& o)
+        else if (n == "is_multicast")
         {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-          Traversal::MCastReceiver_to_EC::source (o);
-          pop_ ();
+          is_multicast_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+          is_multicast_->container (this);
         }
 
-        void MCastReceiver_to_EC::
-        destination (Type const& o)
+        else if (n == "listen_port")
         {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("destination", top_ ()));
-          Traversal::MCastReceiver_to_EC::destination (o);
-          pop_ ();
+          listen_port_ = ::std::auto_ptr< ::XMLSchema::unsignedShort > (new ::XMLSchema::unsignedShort (e));
+          listen_port_->container (this);
         }
 
-        void MCastReceiver_to_EC::
-        id (Type const& o)
+        else 
         {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::MCastReceiver_to_EC::id (o);
-          attr_ (0);
         }
       }
     }
-
+  }
 }
 
 namespace CIAO
 {
   namespace Config_Handlers
   {
-
-      void
-      CIAOEvents (::CIAO::Config_Handlers::CIAOEventsDef const& s, xercesc::DOMDocument* d)
+    ::CIAO::Config_Handlers::CIAOEventsDef
+    CIAOEvents (xercesc::DOMDocument const* d)
+    {
+      ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
+      if (e.name () == "CIAOEvents")
       {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-        if (e.name () != "CIAOEvents")
-        {
-          throw 1;
-        }
+        ::CIAO::Config_Handlers::CIAOEventsDef r (e);
+        return r;
+      }
 
-        struct W : virtual ::CIAO::Config_Handlers::Writer::CIAOEventsDef,
-        virtual ::CIAO::Config_Handlers::Writer::EventServiceDescription,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::EventServiceType,
-        virtual ::CIAO::Config_Handlers::Writer::Filter,
-        virtual ::CIAO::Config_Handlers::Writer::FilterType,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-          : ::XSCRT::Writer< ACE_TCHAR > (e)
-          {
-          }
-        };
-
-        W w (e);
-        w.dispatch (s);
+      else
+      {
+        throw 1;
       }
     }
-
+  }
 }
 
diff --git a/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp b/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
index c71e1986d78..590ec9e7420 100644
--- a/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
+++ b/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
@@ -9,7 +9,6 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
-
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -26,15 +25,14 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-      class EventServiceType;
-      class CIAOEventsDef;
-      class EventServiceDescription;
-      class FilterType;
-      class Filter;
-      class MCastSenderDescription;
-      class MCastReceiverDescription;
-      class EC_to_MCastSender;
-      class MCastReceiver_to_EC;
+    class EventServiceType;
+    class CIAOEventsDef;
+    class EventServiceDescription;
+    class FilterType;
+    class Filter;
+    class AddressServerDescription;
+    class UDPSenderDescription;
+    class UDPReceiverDescription;
   }
 }
 
@@ -46,1453 +44,470 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-      class CIAO_Events_Handlers_Export EventServiceType : public ::XSCRT::Type
+    class CIAO_Events_Handlers_Export EventServiceType : public ::XSCRT::Type
+    {
+      public:
+      EventServiceType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      EventServiceType (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+      static EventServiceType const EC;
+      static EventServiceType const RTEC;
+      static EventServiceType const NOTIFY;
+      static EventServiceType const RTNOTIFY;
+
+      enum Value
       {
-        public:
-        EventServiceType (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        EventServiceType (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-
-        static EventServiceType const EC;
-        static EventServiceType const RTEC;
-        static EventServiceType const NOTIFY;
-        static EventServiceType const RTNOTIFY;
-
-        enum Value
-        {
-          EC_l,RTEC_l,NOTIFY_l,RTNOTIFY_l
-        };
-
-
-        Value
-        integral () const;
-
-        friend bool CIAO_Events_Handlers_Export
-        operator== (EventServiceType const& a, EventServiceType const& b);
-
-        friend bool CIAO_Events_Handlers_Export
-        operator!= (EventServiceType const& a, EventServiceType const& b);
-
-        private:
-        EventServiceType (Value v);
-
-        Value v_;
+        EC_l,RTEC_l,NOTIFY_l,RTNOTIFY_l,
       };
 
-      bool CIAO_Events_Handlers_Export operator== (EventServiceType const &a, EventServiceType const &b);
-
-      bool CIAO_Events_Handlers_Export operator!= (EventServiceType const &a, EventServiceType const &b);
-
-
-      class CIAO_Events_Handlers_Export CIAOEventsDef : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // eventServiceConfiguration
-        //
-        public:
-        typedef ::std::list< ::CIAO::Config_Handlers::EventServiceDescription >::iterator eventServiceConfiguration_iterator;
-        typedef ::std::list< ::CIAO::Config_Handlers::EventServiceDescription >::const_iterator eventServiceConfiguration_const_iterator;
-        eventServiceConfiguration_iterator begin_eventServiceConfiguration ();
-        eventServiceConfiguration_iterator end_eventServiceConfiguration ();
-        eventServiceConfiguration_const_iterator begin_eventServiceConfiguration () const;
-        eventServiceConfiguration_const_iterator end_eventServiceConfiguration () const;
-        void add_eventServiceConfiguration (::CIAO::Config_Handlers::EventServiceDescription const& );
-        size_t count_eventServiceConfiguration (void) const;
-
-        protected:
-        ::std::list< ::CIAO::Config_Handlers::EventServiceDescription > eventServiceConfiguration_;
-
-        // id
-        //
-        public:
-        bool id_p () const;
-        ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-        ::XMLSchema::ID< ACE_TCHAR >& id ();
-        void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-        public:
-        CIAOEventsDef ();
-
-        CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        CIAOEventsDef (CIAOEventsDef const& s);
-
-        CIAOEventsDef&
-        operator= (CIAOEventsDef const& s);
-
-        private:
-        char regulator__;
-      };
-
-
-      class CIAO_Events_Handlers_Export EventServiceDescription : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // name
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& name () const;
-        void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-        // node
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& node () const;
-        void node (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
-
-        // type
-        //
-        public:
-        ::CIAO::Config_Handlers::EventServiceType const& type () const;
-        void type (::CIAO::Config_Handlers::EventServiceType const& );
-
-        protected:
-        ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > type_;
-
-        // svc_cfg_file
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file () const;
-        void svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > svc_cfg_file_;
-
-        // filter
-        //
-        public:
-        typedef ::std::list< ::CIAO::Config_Handlers::Filter >::iterator filter_iterator;
-        typedef ::std::list< ::CIAO::Config_Handlers::Filter >::const_iterator filter_const_iterator;
-        filter_iterator begin_filter ();
-        filter_iterator end_filter ();
-        filter_const_iterator begin_filter () const;
-        filter_const_iterator end_filter () const;
-        void add_filter (::CIAO::Config_Handlers::Filter const& );
-        size_t count_filter (void) const;
-
-        protected:
-        ::std::list< ::CIAO::Config_Handlers::Filter > filter_;
-
-        // id
-        //
-        public:
-        bool id_p () const;
-        ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-        ::XMLSchema::ID< ACE_TCHAR >& id ();
-        void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-        public:
-        EventServiceDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& node__,
-                                 ::CIAO::Config_Handlers::EventServiceType const& type__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__);
-
-        EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        EventServiceDescription (EventServiceDescription const& s);
-
-        EventServiceDescription&
-        operator= (EventServiceDescription const& s);
-
-        private:
-        char regulator__;
-      };
-
-
-      class CIAO_Events_Handlers_Export FilterType : public ::XSCRT::Type
-      {
-        public:
-        FilterType (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        FilterType (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-
-        static FilterType const CONJUNCTION;
-        static FilterType const DISJUNCTION;
-        static FilterType const LOGICAL_AND;
-        static FilterType const NEGATE;
-
-        enum Value
-        {
-          CONJUNCTION_l,DISJUNCTION_l,LOGICAL_AND_l,NEGATE_l
-        };
-
 
-        Value
-        integral () const;
+      Value
+      integral () const;
 
-        friend bool CIAO_Events_Handlers_Export
-        operator== (FilterType const& a, FilterType const& b);
+      friend bool CIAO_Events_Handlers_Export 
+      operator== (EventServiceType const& a, EventServiceType const& b);
 
-        friend bool CIAO_Events_Handlers_Export
-        operator!= (FilterType const& a, FilterType const& b);
+      friend bool CIAO_Events_Handlers_Export 
+      operator!= (EventServiceType const& a, EventServiceType const& b);
 
-        private:
-        FilterType (Value v);
+      private:
+      EventServiceType (Value v);
 
-        Value v_;
-      };
-
-      bool CIAO_Events_Handlers_Export operator== (FilterType const &a, FilterType const &b);
+      Value v_;
+    };
 
-      bool CIAO_Events_Handlers_Export operator!= (FilterType const &a, FilterType const &b);
+    bool CIAO_Events_Handlers_Export operator== (EventServiceType const &a, EventServiceType const &b);
 
+    bool CIAO_Events_Handlers_Export operator!= (EventServiceType const &a, EventServiceType const &b);
 
-      class CIAO_Events_Handlers_Export Filter : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // name
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& name () const;
-        void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-        // type
-        //
-        public:
-        ::CIAO::Config_Handlers::FilterType const& type () const;
-        void type (::CIAO::Config_Handlers::FilterType const& );
-
-        protected:
-        ::std::auto_ptr< ::CIAO::Config_Handlers::FilterType > type_;
-
-        // source
-        //
-        public:
-        typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator;
-        typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator;
-        source_iterator begin_source ();
-        source_iterator end_source ();
-        source_const_iterator begin_source () const;
-        source_const_iterator end_source () const;
-        void add_source (::XMLSchema::string< ACE_TCHAR > const& );
-        size_t count_source (void) const;
-
-        protected:
-        ::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
-
-        // id
-        //
-        public:
-        bool id_p () const;
-        ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-        ::XMLSchema::ID< ACE_TCHAR >& id ();
-        void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-        public:
-        Filter (::XMLSchema::string< ACE_TCHAR > const& name__,
-                ::CIAO::Config_Handlers::FilterType const& type__);
-
-        Filter (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        Filter (Filter const& s);
-
-        Filter&
-        operator= (Filter const& s);
-
-        private:
-        char regulator__;
-      };
-
-
-      class CIAO_Events_Handlers_Export MCastSenderDescription : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // node
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& node () const;
-        void node (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
-
-        // type
-        //
-        public:
-        ::CIAO::Config_Handlers::EventServiceType const& type () const;
-        void type (::CIAO::Config_Handlers::EventServiceType const& );
-
-        protected:
-        ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > type_;
-
-        // svc_cfg_file
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file () const;
-        void svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > svc_cfg_file_;
-
-        // id
-        //
-        public:
-        bool id_p () const;
-        ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-        ::XMLSchema::ID< ACE_TCHAR >& id ();
-        void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-        public:
-        MCastSenderDescription (::XMLSchema::string< ACE_TCHAR > const& node__,
-                                ::CIAO::Config_Handlers::EventServiceType const& type__,
-                                ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__);
-
-        MCastSenderDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        MCastSenderDescription (MCastSenderDescription const& s);
-
-        MCastSenderDescription&
-        operator= (MCastSenderDescription const& s);
-
-        private:
-        char regulator__;
-      };
 
+    class CIAO_Events_Handlers_Export CIAOEventsDef : public ::XSCRT::Type
+    {
+      //@@ VC6 anathema
+      typedef ::XSCRT::Type Base__;
 
-      class CIAO_Events_Handlers_Export MCastReceiverDescription : public ::XSCRT::Type
+      // eventServiceConfiguration
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::EventServiceDescription >::iterator eventServiceConfiguration_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::EventServiceDescription >::const_iterator eventServiceConfiguration_const_iterator;
+      eventServiceConfiguration_iterator begin_eventServiceConfiguration ();
+      eventServiceConfiguration_iterator end_eventServiceConfiguration ();
+      eventServiceConfiguration_const_iterator begin_eventServiceConfiguration () const;
+      eventServiceConfiguration_const_iterator end_eventServiceConfiguration () const;
+      void add_eventServiceConfiguration (::CIAO::Config_Handlers::EventServiceDescription const& );
+      size_t count_eventServiceConfiguration (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::EventServiceDescription > eventServiceConfiguration_;
+
+      // id
+      // 
+      public:
+      bool id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& id ();
+      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+
+      public:
+      CIAOEventsDef ();
+
+      CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      CIAOEventsDef (CIAOEventsDef const& s);
+
+      CIAOEventsDef&
+      operator= (CIAOEventsDef const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class CIAO_Events_Handlers_Export EventServiceDescription : public ::XSCRT::Type
+    {
+      //@@ VC6 anathema
+      typedef ::XSCRT::Type Base__;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // node
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& node () const;
+      void node (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
+
+      // type
+      // 
+      public:
+      ::CIAO::Config_Handlers::EventServiceType const& type () const;
+      void type (::CIAO::Config_Handlers::EventServiceType const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > type_;
+
+      // svc_cfg_file
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file () const;
+      void svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > svc_cfg_file_;
+
+      // filter
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Filter >::iterator filter_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Filter >::const_iterator filter_const_iterator;
+      filter_iterator begin_filter ();
+      filter_iterator end_filter ();
+      filter_const_iterator begin_filter () const;
+      filter_const_iterator end_filter () const;
+      void add_filter (::CIAO::Config_Handlers::Filter const& );
+      size_t count_filter (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Filter > filter_;
+
+      // addr_serv
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::AddressServerDescription >::iterator addr_serv_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::AddressServerDescription >::const_iterator addr_serv_const_iterator;
+      addr_serv_iterator begin_addr_serv ();
+      addr_serv_iterator end_addr_serv ();
+      addr_serv_const_iterator begin_addr_serv () const;
+      addr_serv_const_iterator end_addr_serv () const;
+      void add_addr_serv (::CIAO::Config_Handlers::AddressServerDescription const& );
+      size_t count_addr_serv (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::AddressServerDescription > addr_serv_;
+
+      // udp_sender
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::UDPSenderDescription >::iterator udp_sender_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::UDPSenderDescription >::const_iterator udp_sender_const_iterator;
+      udp_sender_iterator begin_udp_sender ();
+      udp_sender_iterator end_udp_sender ();
+      udp_sender_const_iterator begin_udp_sender () const;
+      udp_sender_const_iterator end_udp_sender () const;
+      void add_udp_sender (::CIAO::Config_Handlers::UDPSenderDescription const& );
+      size_t count_udp_sender (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::UDPSenderDescription > udp_sender_;
+
+      // udp_receiver
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::UDPReceiverDescription >::iterator udp_receiver_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::UDPReceiverDescription >::const_iterator udp_receiver_const_iterator;
+      udp_receiver_iterator begin_udp_receiver ();
+      udp_receiver_iterator end_udp_receiver ();
+      udp_receiver_const_iterator begin_udp_receiver () const;
+      udp_receiver_const_iterator end_udp_receiver () const;
+      void add_udp_receiver (::CIAO::Config_Handlers::UDPReceiverDescription const& );
+      size_t count_udp_receiver (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::UDPReceiverDescription > udp_receiver_;
+
+      // id
+      // 
+      public:
+      bool id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& id ();
+      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+
+      public:
+      EventServiceDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                               ::XMLSchema::string< ACE_TCHAR > const& node__,
+                               ::CIAO::Config_Handlers::EventServiceType const& type__,
+                               ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__);
+
+      EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      EventServiceDescription (EventServiceDescription const& s);
+
+      EventServiceDescription&
+      operator= (EventServiceDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class CIAO_Events_Handlers_Export FilterType : public ::XSCRT::Type
+    {
+      public:
+      FilterType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      FilterType (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+      static FilterType const CONJUNCTION;
+      static FilterType const DISJUNCTION;
+      static FilterType const LOGICAL_AND;
+      static FilterType const NEGATE;
+
+      enum Value
       {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // node
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& node () const;
-        void node (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
-
-        // type
-        //
-        public:
-        ::CIAO::Config_Handlers::EventServiceType const& type () const;
-        void type (::CIAO::Config_Handlers::EventServiceType const& );
-
-        protected:
-        ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > type_;
-
-        // svc_cfg_file
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file () const;
-        void svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > svc_cfg_file_;
-
-        // id
-        //
-        public:
-        bool id_p () const;
-        ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-        ::XMLSchema::ID< ACE_TCHAR >& id ();
-        void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-        public:
-        MCastReceiverDescription (::XMLSchema::string< ACE_TCHAR > const& node__,
-                                  ::CIAO::Config_Handlers::EventServiceType const& type__,
-                                  ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__);
-
-        MCastReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        MCastReceiverDescription (MCastReceiverDescription const& s);
-
-        MCastReceiverDescription&
-        operator= (MCastReceiverDescription const& s);
-
-        private:
-        char regulator__;
+        CONJUNCTION_l,DISJUNCTION_l,LOGICAL_AND_l,NEGATE_l,
       };
 
 
-      class CIAO_Events_Handlers_Export EC_to_MCastSender : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // destination
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& destination () const;
-        void destination (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > destination_;
-
-        // id
-        //
-        public:
-        bool id_p () const;
-        ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-        ::XMLSchema::ID< ACE_TCHAR >& id ();
-        void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-        public:
-        EC_to_MCastSender (::XMLSchema::string< ACE_TCHAR > const& destination__);
-
-        EC_to_MCastSender (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        EC_to_MCastSender (EC_to_MCastSender const& s);
-
-        EC_to_MCastSender&
-        operator= (EC_to_MCastSender const& s);
-
-        private:
-        char regulator__;
-      };
-
-
-      class CIAO_Events_Handlers_Export MCastReceiver_to_EC : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // source
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& source () const;
-        void source (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
-
-        // destination
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& destination () const;
-        void destination (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > destination_;
-
-        // id
-        //
-        public:
-        bool id_p () const;
-        ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-        ::XMLSchema::ID< ACE_TCHAR >& id ();
-        void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-        public:
-        MCastReceiver_to_EC (::XMLSchema::string< ACE_TCHAR > const& source__,
-                             ::XMLSchema::string< ACE_TCHAR > const& destination__);
-
-        MCastReceiver_to_EC (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        MCastReceiver_to_EC (MCastReceiver_to_EC const& s);
-
-        MCastReceiver_to_EC&
-        operator= (MCastReceiver_to_EC const& s);
-
-        private:
-        char regulator__;
-      };
-    }
-
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-      CIAO_Events_Handlers_Export
-      ::CIAO::Config_Handlers::CIAOEventsDef
-      CIAOEvents (xercesc::DOMDocument const*);
-  }
-}
-
-#include "XMLSchema/Traversal.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-      namespace Traversal
-      {
-        typedef
-        ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EventServiceType >
-        EventServiceType;
-
-        struct CIAO_Events_Handlers_Export CIAOEventsDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CIAOEventsDef >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          eventServiceConfiguration (Type&);
-
-          virtual void
-          eventServiceConfiguration (Type const&);
-
-          virtual void
-          eventServiceConfiguration_pre (Type&);
-
-          virtual void
-          eventServiceConfiguration_pre (Type const&);
-
-          virtual void
-          eventServiceConfiguration_next (Type&);
-
-          virtual void
-          eventServiceConfiguration_next (Type const&);
-
-          virtual void
-          eventServiceConfiguration_post (Type&);
-
-          virtual void
-          eventServiceConfiguration_post (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        struct CIAO_Events_Handlers_Export EventServiceDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EventServiceDescription >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          name (Type&);
-
-          virtual void
-          name (Type const&);
-
-          virtual void
-          node (Type&);
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type&);
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type&);
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          filter (Type&);
-
-          virtual void
-          filter (Type const&);
-
-          virtual void
-          filter_pre (Type&);
-
-          virtual void
-          filter_pre (Type const&);
-
-          virtual void
-          filter_next (Type&);
-
-          virtual void
-          filter_next (Type const&);
-
-          virtual void
-          filter_post (Type&);
-
-          virtual void
-          filter_post (Type const&);
-
-          virtual void
-          filter_none (Type&);
-
-          virtual void
-          filter_none (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        typedef
-        ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::FilterType >
-        FilterType;
-
-        struct CIAO_Events_Handlers_Export Filter : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Filter >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          name (Type&);
-
-          virtual void
-          name (Type const&);
-
-          virtual void
-          type (Type&);
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          source (Type&);
-
-          virtual void
-          source (Type const&);
-
-          virtual void
-          source_pre (Type&);
-
-          virtual void
-          source_pre (Type const&);
-
-          virtual void
-          source_next (Type&);
-
-          virtual void
-          source_next (Type const&);
-
-          virtual void
-          source_post (Type&);
-
-          virtual void
-          source_post (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        struct CIAO_Events_Handlers_Export MCastSenderDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MCastSenderDescription >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          node (Type&);
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type&);
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type&);
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        struct CIAO_Events_Handlers_Export MCastReceiverDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MCastReceiverDescription >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          node (Type&);
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type&);
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type&);
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        struct CIAO_Events_Handlers_Export EC_to_MCastSender : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EC_to_MCastSender >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
+      Value
+      integral () const;
 
-          virtual void
-          pre (Type&);
+      friend bool CIAO_Events_Handlers_Export 
+      operator== (FilterType const& a, FilterType const& b);
 
-          virtual void
-          pre (Type const&);
+      friend bool CIAO_Events_Handlers_Export 
+      operator!= (FilterType const& a, FilterType const& b);
 
-          virtual void
-          destination (Type&);
+      private:
+      FilterType (Value v);
 
-          virtual void
-          destination (Type const&);
+      Value v_;
+    };
 
-          virtual void
-          id (Type&);
+    bool CIAO_Events_Handlers_Export operator== (FilterType const &a, FilterType const &b);
 
-          virtual void
-          id (Type const&);
+    bool CIAO_Events_Handlers_Export operator!= (FilterType const &a, FilterType const &b);
 
-          virtual void
-          id_none (Type&);
 
-          virtual void
-          id_none (Type const&);
+    class CIAO_Events_Handlers_Export Filter : public ::XSCRT::Type
+    {
+      //@@ VC6 anathema
+      typedef ::XSCRT::Type Base__;
 
-          virtual void
-          post (Type&);
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-          virtual void
-          post (Type const&);
-        };
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-        struct CIAO_Events_Handlers_Export MCastReceiver_to_EC : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MCastReceiver_to_EC >
-        {
-          virtual void
-          traverse (Type&);
+      // type
+      // 
+      public:
+      ::CIAO::Config_Handlers::FilterType const& type () const;
+      void type (::CIAO::Config_Handlers::FilterType const& );
 
-          virtual void
-          traverse (Type const&);
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::FilterType > type_;
 
-          virtual void
-          pre (Type&);
+      // source
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator;
+      source_iterator begin_source ();
+      source_iterator end_source ();
+      source_const_iterator begin_source () const;
+      source_const_iterator end_source () const;
+      void add_source (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_source (void) const;
 
-          virtual void
-          pre (Type const&);
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
 
-          virtual void
-          source (Type&);
+      // id
+      // 
+      public:
+      bool id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& id ();
+      void id (::XMLSchema::ID< ACE_TCHAR > const& );
 
-          virtual void
-          source (Type const&);
+      protected:
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
 
-          virtual void
-          destination (Type&);
+      public:
+      Filter (::XMLSchema::string< ACE_TCHAR > const& name__,
+              ::CIAO::Config_Handlers::FilterType const& type__);
 
-          virtual void
-          destination (Type const&);
+      Filter (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      Filter (Filter const& s);
 
-          virtual void
-          id (Type&);
+      Filter&
+      operator= (Filter const& s);
 
-          virtual void
-          id (Type const&);
+      private:
+      char regulator__;
+    };
 
-          virtual void
-          id_none (Type&);
 
-          virtual void
-          id_none (Type const&);
+    class CIAO_Events_Handlers_Export AddressServerDescription : public ::XSCRT::Type
+    {
+      //@@ VC6 anathema
+      typedef ::XSCRT::Type Base__;
 
-          virtual void
-          post (Type&);
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-          virtual void
-          post (Type const&);
-        };
-      }
-    }
-
-}
-
-#include "XMLSchema/Writer.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-      namespace Writer
-      {
-        struct EventServiceType : Traversal::EventServiceType,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          EventServiceType (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-          virtual void
-          traverse (Type const&);
-
-          protected:
-          EventServiceType ();
-        };
-
-        struct CIAOEventsDef : Traversal::CIAOEventsDef,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::CIAOEventsDef Type;
-          CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          eventServiceConfiguration_pre (Type &o)
-          {
-
-            this->eventServiceConfiguration_pre (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          eventServiceConfiguration_pre (Type const&);
-
-          virtual void
-          eventServiceConfiguration_next (Type &o)
-          {
-
-            this->eventServiceConfiguration_next (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          eventServiceConfiguration_next (Type const&);
-
-          virtual void
-          eventServiceConfiguration_post (Type &o)
-          {
-
-            this->eventServiceConfiguration_post (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          eventServiceConfiguration_post (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          CIAOEventsDef ();
-        };
-
-        struct EventServiceDescription : Traversal::EventServiceDescription,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::EventServiceDescription Type;
-          EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          name (Type &o)
-          {
-
-            this->name (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          name (Type const&);
-
-          virtual void
-          node (Type &o)
-          {
-
-            this->node (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type &o)
-          {
-
-            this->type (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type &o)
-          {
-
-            this->svc_cfg_file (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          filter_pre (Type &o)
-          {
-
-            this->filter_pre (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          filter_pre (Type const&);
-
-          virtual void
-          filter_next (Type &o)
-          {
-
-            this->filter_next (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          filter_next (Type const&);
-
-          virtual void
-          filter_post (Type &o)
-          {
-
-            this->filter_post (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          filter_post (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          EventServiceDescription ();
-        };
-
-        struct FilterType : Traversal::FilterType,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          FilterType (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-          virtual void
-          traverse (Type const&);
-
-          protected:
-          FilterType ();
-        };
-
-        struct Filter : Traversal::Filter,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::Filter Type;
-          Filter (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          name (Type &o)
-          {
-
-            this->name (const_cast <Type const &> (o));
-          }
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
+      // port
+      // 
+      public:
+      ::XMLSchema::unsignedShort const& port () const;
+      void port (::XMLSchema::unsignedShort const& );
 
-          virtual void
-          name (Type const&);
+      protected:
+      ::std::auto_ptr< ::XMLSchema::unsignedShort > port_;
+
+      // address
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& address () const;
+      void address (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > address_;
+
+      public:
+      AddressServerDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                                ::XMLSchema::unsignedShort const& port__,
+                                ::XMLSchema::string< ACE_TCHAR > const& address__);
+
+      AddressServerDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      AddressServerDescription (AddressServerDescription const& s);
+
+      AddressServerDescription&
+      operator= (AddressServerDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class CIAO_Events_Handlers_Export UDPSenderDescription : public ::XSCRT::Type
+    {
+      //@@ VC6 anathema
+      typedef ::XSCRT::Type Base__;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // addr_serv_id
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& addr_serv_id () const;
+      void addr_serv_id (::XMLSchema::string< ACE_TCHAR > const& );
 
-          virtual void
-          type (Type &o)
-          {
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > addr_serv_id_;
 
-            this->type (const_cast <Type const &> (o));
-          }
+      public:
+      UDPSenderDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                            ::XMLSchema::string< ACE_TCHAR > const& addr_serv_id__);
+
+      UDPSenderDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      UDPSenderDescription (UDPSenderDescription const& s);
 
+      UDPSenderDescription&
+      operator= (UDPSenderDescription const& s);
 
-          virtual void
-          type (Type const&);
+      private:
+      char regulator__;
+    };
 
-          virtual void
-          source_pre (Type &o)
-          {
 
-            this->source_pre (const_cast <Type const &> (o));
-          }
+    class CIAO_Events_Handlers_Export UDPReceiverDescription : public ::XSCRT::Type
+    {
+      //@@ VC6 anathema
+      typedef ::XSCRT::Type Base__;
 
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-          virtual void
-          source_pre (Type const&);
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-          virtual void
-          source_next (Type &o)
-          {
+      // addr_serv_id
+      // 
+      public:
+      bool addr_serv_id_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& addr_serv_id () const;
+      void addr_serv_id (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > addr_serv_id_;
 
-            this->source_next (const_cast <Type const &> (o));
-          }
+      // is_multicast
+      // 
+      public:
+      ::XMLSchema::boolean const& is_multicast () const;
+      void is_multicast (::XMLSchema::boolean const& );
 
+      protected:
+      ::std::auto_ptr< ::XMLSchema::boolean > is_multicast_;
 
-          virtual void
-          source_next (Type const&);
+      // listen_port
+      // 
+      public:
+      ::XMLSchema::unsignedShort const& listen_port () const;
+      void listen_port (::XMLSchema::unsignedShort const& );
 
-          virtual void
-          source_post (Type &o)
-          {
+      protected:
+      ::std::auto_ptr< ::XMLSchema::unsignedShort > listen_port_;
 
-            this->source_post (const_cast <Type const &> (o));
-          }
+      public:
+      UDPReceiverDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                              ::XMLSchema::boolean const& is_multicast__,
+                              ::XMLSchema::unsignedShort const& listen_port__);
 
+      UDPReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      UDPReceiverDescription (UDPReceiverDescription const& s);
 
-          virtual void
-          source_post (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          Filter ();
-        };
-
-        struct MCastSenderDescription : Traversal::MCastSenderDescription,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::MCastSenderDescription Type;
-          MCastSenderDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          node (Type &o)
-          {
-
-            this->node (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type &o)
-          {
-
-            this->type (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type &o)
-          {
-
-            this->svc_cfg_file (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          MCastSenderDescription ();
-        };
-
-        struct MCastReceiverDescription : Traversal::MCastReceiverDescription,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::MCastReceiverDescription Type;
-          MCastReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          node (Type &o)
-          {
-
-            this->node (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type &o)
-          {
-
-            this->type (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type &o)
-          {
-
-            this->svc_cfg_file (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          MCastReceiverDescription ();
-        };
-
-        struct EC_to_MCastSender : Traversal::EC_to_MCastSender,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::EC_to_MCastSender Type;
-          EC_to_MCastSender (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          destination (Type &o)
-          {
-
-            this->destination (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          destination (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          EC_to_MCastSender ();
-        };
-
-        struct MCastReceiver_to_EC : Traversal::MCastReceiver_to_EC,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::MCastReceiver_to_EC Type;
-          MCastReceiver_to_EC (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          source (Type &o)
-          {
-
-            this->source (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          source (Type const&);
-
-          virtual void
-          destination (Type &o)
-          {
-
-            this->destination (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          destination (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          MCastReceiver_to_EC ();
-        };
-      }
-    }
+      UDPReceiverDescription&
+      operator= (UDPReceiverDescription const& s);
 
+      private:
+      char regulator__;
+    };
+  }
 }
 
 namespace CIAO
 {
   namespace Config_Handlers
   {
-      CIAO_Events_Handlers_Export
-      void
-      CIAOEvents (::CIAO::Config_Handlers::CIAOEventsDef const&, xercesc::DOMDocument*);
+    CIAO_Events_Handlers_Export
+    ::CIAO::Config_Handlers::CIAOEventsDef
+    CIAOEvents (xercesc::DOMDocument const*);
   }
 }
 
diff --git a/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp b/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
index 114081d5b8b..fd7cb12a464 100644
--- a/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
+++ b/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
@@ -82,6 +82,7 @@ namespace CIAO
            a_esd.svc_cfg_file = CORBA::string_dup  (i->svc_cfg_file ().c_str ());
 
 
+           // Populate filtering information for this event channel
            a_esd.filters.length (i->count_filter ());
            CORBA::ULong pos_j = 0;
            for (EventServiceDescription::filter_const_iterator j = i->begin_filter ();
@@ -122,6 +123,47 @@ namespace CIAO
                pos_j++;
             }
 
+           // Populate address server information for this event channel
+           a_esd.addr_servs.length (i->count_addr_serv ());
+           pos_j = 0;
+           for (EventServiceDescription::addr_serv_const_iterator j = i->begin_addr_serv ();
+                j != i->end_addr_serv ();
+                j++)
+           {
+              a_esd.addr_servs[pos_j].name = CORBA::string_dup (j->name ().c_str ());
+              a_esd.addr_servs[pos_j].port = j->port ();
+              a_esd.addr_servs[pos_j].address = CORBA::string_dup (j->address ().c_str ());
+              pos_j++;
+            }
+
+           // Populate UDP sender information for this event channel
+           a_esd.senders.length (i->count_udp_sender ());
+           pos_j = 0;
+           for (EventServiceDescription::udp_sender_const_iterator j = i->begin_udp_sender ();
+                j != i->end_udp_sender ();
+                j++)
+           {
+              a_esd.senders[pos_j].name = CORBA::string_dup (j->name ().c_str ());
+              a_esd.senders[pos_j].addr_serv_id = 
+                CORBA::string_dup (j->addr_serv_id ().c_str ());
+              pos_j++;
+            }
+
+           // Populate UDP receiver information for this event channel
+           a_esd.receivers.length (i->count_udp_receiver ());
+           pos_j = 0;
+           for (EventServiceDescription::udp_receiver_const_iterator j = i->begin_udp_receiver ();
+                j != i->end_udp_receiver ();
+                j++)
+           {
+              a_esd.receivers[pos_j].name = CORBA::string_dup (j->name ().c_str ());
+              a_esd.receivers[pos_j].addr_serv_id = 
+                CORBA::string_dup (j->addr_serv_id ().c_str ());
+              a_esd.receivers[pos_j].is_multicast = j->is_multicast ();
+              a_esd.receivers[pos_j].listen_port = j->listen_port ();
+              pos_j++;
+            }
+
            (*this->idl_esd_)[pos_i] = a_esd;
            pos_i++;
       }