*** empty log message ***

17 files changed, 176 insertions, 54 deletions

diff --git a/TAO/CIAO/CIAO_TAO.mwc b/TAO/CIAO/CIAO_TAO.mwc
index a6d1cfad344..ba2347ca3b6 100644
--- a/TAO/CIAO/CIAO_TAO.mwc
+++ b/TAO/CIAO/CIAO_TAO.mwc
@@ -15,6 +15,10 @@ workspace {
   ../orbsvcs/orbsvcs/Svc_Utils.mpc
   ../orbsvcs/orbsvcs/Security.mpc
   ../orbsvcs/orbsvcs/IFRService.mpc
+  ../orbsvcs/orbsvcs/RTEvent_Serv.mpc
+  ../orbsvcs/orbsvcs/RTEvent_Skel.mpc
+  ../orbsvcs/orbsvcs/RTEvent.mpc
+
   DAnCE
   ciao
   tools
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index eb86114768b..3380ebfbeb6 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -1220,9 +1220,6 @@ populate_connection_for_binding (
      Deployment::Connections & retv)
   ACE_THROW_SPEC ((Deployment::StartError))
 {
-  // The initial retv might have something inside
-  CORBA::ULong len = retv.length ();
-
   const CORBA::ULong binding_len = binding.internalEndpoint.length ();
 
   if (binding_len == 1)
diff --git a/TAO/CIAO/ciao/Deployment_Core.idl b/TAO/CIAO/ciao/Deployment_Core.idl
index bf6212e0d2f..fec1b124c61 100644
--- a/TAO/CIAO/ciao/Deployment_Core.idl
+++ b/TAO/CIAO/ciao/Deployment_Core.idl
@@ -4,7 +4,7 @@
 #define DEPLOYMENT_CORE_IDL
 
 #include "CCM_Component.idl"
-#include <ciaosvcs/Events/CIAO_Events.idl>
+#include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
 
 // *************** Packaging and Deployment ***************
 module Deployment
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp b/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp
index 3c9119ec3b2..c1dd8aaa153 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp
@@ -11,7 +11,6 @@
 //=============================================================================
 
 #include "CIAO_EventService_Factory_impl.h"
-#include "ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h"
 #include "ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h"
 
 namespace CIAO
@@ -42,13 +41,17 @@ namespace CIAO
     switch (type)
     {
       case RTEC:
-        {
-          ACE_NEW_RETURN (event_service,
-                          RTEventService (this->orb_.in (),
-                                          this->poa_.in ()),
+        ACE_NEW_RETURN (event_service,
+                        RTEventService (this->orb_.in (),
+                                        this->poa_.in ()),
+                        0);
+        break;
+
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR, "CIAO::EventService_Factory_impl::"
+                          "create_event_service: unsuppoted type.\n"),
                           0);
-          break;
-        }
+
     }
 
     // Activate the servant
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.h b/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.h
index 043f4592eb2..32f0b343903 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.h
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.h
@@ -21,7 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "CIAO_Events_Export.h"
-#include "CIAO_EventServiceBase.h"
+#include "ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h"
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
index cf9162581fd..ed488fb7e35 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
@@ -1,38 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-
-project (CIAO_DnC_Events_Base) : orbsvcslib, ciao_events_dnc {
-
-  requires += dummy_label
-  after += CIAO_DnC_Container
-  sharedname  = CIAO_DnC_Events_Base
-  idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
-  dynamicflags = CIAO_EVENTS_BUILD_DLL
-
-  IDL_Files {
-    CIAO_Events.idl
-  }
-
-  Source_Files {
-    CIAO_EventServiceBase.cpp
-    CIAO_EventsC.cpp
-    CIAO_EventsS.cpp
-  }
-
-  Header_Files {
-    CIAO_EventsC.h
-    CIAO_EventsS.h
-    CIAO_EventServiceBase.h
-  }
-}
-
 project (CIAO_DnC_Events) : orbsvcslib, ciao_events_dnc {
 
-  requires += dummy_label
   after += CIAO_DnC_Events_Base CIAO_RTEvent
   sharedname  = CIAO_DnC_Events
-  libs	+= CIAO_DnC_Events_Base CIAO_RTEvent CIAO_DirectEvent
+  libs	+= CIAO_DnC_Events_Base CIAO_RTEvent
   idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
   dynamicflags = CIAO_EVENTS_BUILD_DLL
 
@@ -43,4 +16,4 @@ project (CIAO_DnC_Events) : orbsvcslib, ciao_events_dnc {
   Header_Files {
     CIAO_EventService_Factory_impl.h
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_EventServiceBase.cpp b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
index 9c2563477b2..9c2563477b2 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_EventServiceBase.cpp
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_EventServiceBase.h b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
index 45990bf72ce..90b9f872ca6 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_EventServiceBase.h
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
@@ -83,7 +83,6 @@ namespace CIAO
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
-        Components::InvalidName,
         Components::InvalidConnection)) = 0;
 
     /**
@@ -96,7 +95,6 @@ namespace CIAO
         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
-        Components::InvalidName,
         Components::InvalidConnection)) = 0;
 
     /**
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl
new file mode 100644
index 00000000000..bcfcca9ef93
--- /dev/null
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl
@@ -0,0 +1,69 @@
+// $Id$
+
+/**
+ * @file CIAO_Events.idl
+ *
+ * @author George Edwards <g.edwards@vanderbilt.edu>
+ * @author Gan Deng <dengg@dre.vanderbilt.edu>
+ *
+ * @brief Interfaces for configuring CIAO's event mechanism.
+ */
+
+#include "ciao/CCM_Event.idl"
+
+module CIAO
+{
+  /// A component's UUID + port name.
+  typedef string CONNECTION_ID;
+
+  enum EventServiceType
+  {
+    DIRECT,
+    EC,
+    RTEC,
+    NOTIFY,
+    RTNOTIFY
+  };
+
+  interface Supplier_Config
+  {
+    attribute CONNECTION_ID supplier_id;
+
+    readonly attribute EventServiceType service_type;
+
+    void destroy ();
+  };
+
+  interface Consumer_Config : Supplier_Config
+  {
+    attribute CONNECTION_ID consumer_id;
+    attribute Components::EventConsumerBase consumer;
+
+    void start_conjunction_group (in long size);
+
+    void start_disjunction_group (in long size);
+
+    void insert_source (in CONNECTION_ID source_id);
+
+    void insert_type (in long event_type);
+  };
+
+  interface CIAO_Event_Service : Components::EventConsumerBase
+  {
+    Supplier_Config create_supplier_config ();
+
+    Consumer_Config create_consumer_config ();
+
+    void connect_event_supplier (in Supplier_Config supplier_conf);
+
+    void connect_event_consumer (in Consumer_Config consumer_conf);
+
+    void disconnect_event_supplier (in CONNECTION_ID conn_id)
+      raises (Components::InvalidConnection);
+
+    void disconnect_event_consumer (in CONNECTION_ID conn_id)
+      raises (Components::InvalidConnection);
+
+    //void push_event (in Components::EventBase ev);
+  };
+};
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
new file mode 100644
index 00000000000..69d8f7d147d
--- /dev/null
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
@@ -0,0 +1,27 @@
+// -*- MPC -*-
+// $Id$
+
+
+project (CIAO_DnC_Events_Base) : orbsvcslib, ciao_events_dnc {
+
+  after += CIAO_DnC_Container
+  sharedname  = CIAO_DnC_Events_Base
+  idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
+  dynamicflags = CIAO_EVENTS_BUILD_DLL
+
+  IDL_Files {
+    CIAO_Events.idl
+  }
+
+  Source_Files {
+    CIAO_EventServiceBase.cpp
+    CIAO_EventsC.cpp
+    CIAO_EventsS.cpp
+  }
+
+  Header_Files {
+    CIAO_EventsC.h
+    CIAO_EventsS.h
+    CIAO_EventServiceBase.h
+  }
+}
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h
new file mode 100644
index 00000000000..6678cef4bcc
--- /dev/null
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h
@@ -0,0 +1,53 @@
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl CIAO_EVENTS
+// ------------------------------
+#ifndef CIAO_EVENTS_EXPORT_H
+#define CIAO_EVENTS_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (CIAO_EVENTS_HAS_DLL)
+#  define CIAO_EVENTS_HAS_DLL 1
+#endif /* ! CIAO_EVENTS_HAS_DLL */
+
+#if defined (CIAO_EVENTS_HAS_DLL) && (CIAO_EVENTS_HAS_DLL == 1)
+#  if defined (CIAO_EVENTS_BUILD_DLL)
+#    define CIAO_EVENTS_Export ACE_Proper_Export_Flag
+#    define CIAO_EVENTS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAO_EVENTS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* CIAO_EVENTS_BUILD_DLL */
+#    define CIAO_EVENTS_Export ACE_Proper_Import_Flag
+#    define CIAO_EVENTS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAO_EVENTS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* CIAO_EVENTS_BUILD_DLL */
+#else /* CIAO_EVENTS_HAS_DLL == 1 */
+#  define CIAO_EVENTS_Export
+#  define CIAO_EVENTS_SINGLETON_DECLARATION(T)
+#  define CIAO_EVENTS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* CIAO_EVENTS_HAS_DLL == 1 */
+
+// Set CIAO_EVENTS_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (CIAO_EVENTS_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define CIAO_EVENTS_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define CIAO_EVENTS_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !CIAO_EVENTS_NTRACE */
+
+#if (CIAO_EVENTS_NTRACE == 1)
+#  define CIAO_EVENTS_TRACE(X)
+#else /* (CIAO_EVENTS_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define CIAO_EVENTS_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (CIAO_EVENTS_NTRACE == 1) */
+
+#endif /* CIAO_EVENTS_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
index d9d081c2222..6766335e4ea 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
@@ -189,9 +189,10 @@ namespace CIAO
       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
-      Components::InvalidName,
       Components::InvalidConnection))
   {
+    ACE_UNUSED_ARG (connection_id);
+
     this->proxy_consumer_->disconnect_push_consumer (
       ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
@@ -205,7 +206,6 @@ namespace CIAO
       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
-      Components::InvalidName,
       Components::InvalidConnection))
   {
     RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier;
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
index 83f1f0196a7..0cdc8905a69 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciaosvcs/Events/CIAO_EventServiceBase.h"
+#include "ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h"
 #include "CIAO_RTEventS.h"
 
 #include "ace/Hash_Map_Manager.h"
@@ -76,7 +76,6 @@ namespace CIAO
         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
-        Components::InvalidName,
         Components::InvalidConnection));
 
     virtual void disconnect_event_consumer (
@@ -84,7 +83,6 @@ namespace CIAO
         ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
-        Components::InvalidName,
         Components::InvalidConnection));
 
     virtual void push_event (
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl
index 6d188ea7871..b51d00ec07d 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl
@@ -9,7 +9,7 @@
  * @brief Interfaces for configuring CIAO's RT event channel.
  */
 
-#include "CIAO_Events.idl"
+#include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
 #include <orbsvcs/orbsvcs/RtecEventChannelAdmin.idl>
 
 module CIAO
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc
index 0f079a0fde0..dcd7487b0cb 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc
@@ -3,7 +3,6 @@
 
 project (CIAO_RTEvent) : rtevent_serv, ciao_events_dnc {
 
-  requires += dummy_label
   after += CIAO_DnC_Events_Base
   sharedname  = CIAO_RTEvent
   libs += CIAO_DnC_Events_Base
diff --git a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
index d6a183deb0a..7a27aa76a64 100644
--- a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
@@ -51,9 +51,11 @@ namespace CIAO
 
       ~CIAOEvents_Handler (void);
 
-      CIAO::DAnCE::EventServiceDeploymentDescriptions const *esd_idl (void) const;
+      CIAO::DAnCE::EventServiceDeploymentDescriptions const *esd_idl (void) const
+        throw (CIAOEvents_Handler::NoESD);
 
-      CIAO::DAnCE::EventServiceDeploymentDescriptions *esd_idl (void);
+      CIAO::DAnCE::EventServiceDeploymentDescriptions *esd_idl (void)
+        throw (CIAOEvents_Handler::NoESD);
 
     private:
       bool build_esd ();
diff --git a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
index 06ea67b55cc..3e1b90b61ba 100644
--- a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
@@ -6,7 +6,7 @@ project (CIAO_Events_Handlers) : acelib, ciao_deployment_stub, xerces {
   macros   += XML_USE_PTHREADS
   requires += exceptions
   includes += $(CIAO_ROOT)/tools/Config_Handlers
-  after    += CIAO_XML_Utils
+  after    += CIAO_XML_Utils CIAO_DnC_Events
   libs     += CIAO_XML_Utils
   includes += $(CIAO_ROOT)/ciao
 
@@ -20,7 +20,6 @@ project (CIAO_Events_Handlers) : acelib, ciao_deployment_stub, xerces {
 }
 
 project (CIAO_Events_Handlers_Tests) : ciao_component_dnc, xerces {
-  requires += dummy_label
   exename = test
   after    += CIAO_Events_Handlers
 //  dynamicflags   = CONFIG_HANDLERS_BUILD_DLL