*** empty log message ***

15 files changed, 54 insertions, 18 deletions

diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 40b37ab6094..148c9032c8c 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -90,6 +90,8 @@ project (CIAO_Container) : orbsvcslib, portableserver, security, iorinterceptor,
     Container_Impl.cpp
     CCM_DeploymentC.cpp
     CCM_DeploymentS.cpp
+    CIAO_EventsC.cpp
+    CIAO_EventsS.cpp
   }
 
 }
diff --git a/TAO/CIAO/ciao/CIAO_CosNotify.cpp b/TAO/CIAO/ciao/CIAO_CosNotify.cpp
index 7c16291da37..42773eb45fc 100644
--- a/TAO/CIAO/ciao/CIAO_CosNotify.cpp
+++ b/TAO/CIAO/ciao/CIAO_CosNotify.cpp
@@ -76,7 +76,7 @@ namespace CIAO
 
     if (CORBA::is_nil (notify_config))
       {
-        ACE_THROW ((CORBA::BAD_PARAM ()));
+        ACE_THROW (CORBA::BAD_PARAM ());
       }
 
     CosNotifyFilter::Filter_var filter =
@@ -166,7 +166,7 @@ namespace CIAO
 
     if (CORBA::is_nil (notify_config))
       {
-        ACE_THROW ((CORBA::BAD_PARAM ()));
+        ACE_THROW (CORBA::BAD_PARAM ());
       }
 
     CosNotifyFilter::Filter_var filter =
@@ -303,6 +303,8 @@ namespace CIAO
   void
   CosNotifyServiceConsumer_impl::push_structured_event (
       const CosNotification::StructuredEvent& event)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+		     CosEventComm::Disconnected))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "CosNotifyServiceConsumer_impl::push_structured_event\n"));
diff --git a/TAO/CIAO/ciao/CIAO_CosNotify.h b/TAO/CIAO/ciao/CIAO_CosNotify.h
index 7436390aaa5..e5fc5e587b4 100644
--- a/TAO/CIAO/ciao/CIAO_CosNotify.h
+++ b/TAO/CIAO/ciao/CIAO_CosNotify.h
@@ -173,7 +173,10 @@ namespace CIAO
       Components::EventConsumerBase_ptr consumer);
 
     virtual void push_structured_event (
-      const CosNotification::StructuredEvent& event);
+      const CosNotification::StructuredEvent& event)
+      ACE_THROW_SPEC ((
+	CosEventComm::Disconnected,
+	CORBA::SystemException));
 
     virtual void disconnect_structured_push_consumer (
         ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/CIAO/ciao/CIAO_EventService_Factory_impl.h b/TAO/CIAO/ciao/CIAO_EventService_Factory_impl.h
index ccf8677c85c..f1c3837e3a5 100644
--- a/TAO/CIAO/ciao/CIAO_EventService_Factory_impl.h
+++ b/TAO/CIAO/ciao/CIAO_EventService_Factory_impl.h
@@ -14,16 +14,16 @@
 #define CIAO_EVENTSERVICE_FACTORY_IMPL_H
 #include /**/ "ace/pre.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "CIAO_EventService_Factory.h"
 
 #include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "tao/PortableServer/PortableServer.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 namespace CIAO
 {
 
diff --git a/TAO/CIAO/ciao/CIAO_Events.idl b/TAO/CIAO/ciao/CIAO_Events.idl
index a4d975e9174..8533bc69afa 100644
--- a/TAO/CIAO/ciao/CIAO_Events.idl
+++ b/TAO/CIAO/ciao/CIAO_Events.idl
@@ -54,11 +54,13 @@ module CIAO
     
     void connect_event_supplier (in Supplier_Config supplier_config);
     
-    void disconnect_event_supplier (in CONNECTION_ID connection_id);
+    void disconnect_event_supplier (in CONNECTION_ID connection_id)
+      raises (Components::InvalidConnection, Components::InvalidName);
     
     void connect_event_consumer (in Consumer_Config consumer_config);
     
-    void disconnect_event_consumer (in CONNECTION_ID connection_id);
+    void disconnect_event_consumer (in CONNECTION_ID connection_id)
+      raises (Components::InvalidConnection, Components::InvalidName);
     
     void push_event (in Components::EventBase ev,
                      in CONNECTION_ID connection_id);
diff --git a/TAO/CIAO/ciao/CIAO_RTEvent.cpp b/TAO/CIAO/ciao/CIAO_RTEvent.cpp
index 360cae4d27f..a559eaab2d9 100644
--- a/TAO/CIAO/ciao/CIAO_RTEvent.cpp
+++ b/TAO/CIAO/ciao/CIAO_RTEvent.cpp
@@ -70,7 +70,7 @@ namespace CIAO
 
     if (CORBA::is_nil (rt_config))
       {
-        ACE_THROW ((CORBA::BAD_PARAM ()));
+        ACE_THROW (CORBA::BAD_PARAM ());
       }
 
     RtecEventChannelAdmin::SupplierQOS_var qos =
@@ -126,7 +126,7 @@ namespace CIAO
 
     if (CORBA::is_nil (rt_config))
       {
-        ACE_THROW ((CORBA::BAD_PARAM ()));
+        ACE_THROW (CORBA::BAD_PARAM ());
       }
 
     RtecEventChannelAdmin::ConsumerQOS_var qos =
@@ -215,6 +215,8 @@ namespace CIAO
 
   void
   RTEventServiceSupplier_impl::disconnect_push_supplier (void)
+    ACE_THROW_SPEC ((
+		     CORBA::SystemException))
   {
     PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this);
     this->poa_->deactivate_object (oid);
@@ -231,6 +233,7 @@ namespace CIAO
 
   void
   RTEventServiceConsumer_impl::push (const RtecEventComm::EventSet& events)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     //ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventServiceConsumer_impl::push\n"));
 
diff --git a/TAO/CIAO/ciao/CIAO_RTEvent.h b/TAO/CIAO/ciao/CIAO_RTEvent.h
index 806f633fc19..bc360ce60a7 100644
--- a/TAO/CIAO/ciao/CIAO_RTEvent.h
+++ b/TAO/CIAO/ciao/CIAO_RTEvent.h
@@ -169,7 +169,9 @@ namespace CIAO
       Components::EventConsumerBase_ptr consumer);
 
     virtual void push (
-      const RtecEventComm::EventSet& events);
+      const RtecEventComm::EventSet& events)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException));
 
     virtual void disconnect_push_consumer (
         ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/CIAO/ciao/Container_Base.h b/TAO/CIAO/ciao/Container_Base.h
index 5122256b4da..55b39322fdc 100644
--- a/TAO/CIAO/ciao/Container_Base.h
+++ b/TAO/CIAO/ciao/Container_Base.h
@@ -84,7 +84,8 @@ namespace CIAO
 
     ContainerEventService_ptr
     CIAO::Container::get_container_events_ref (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     // ContainerEventService implementation
 
diff --git a/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc b/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc
index ef0e403f308..04ff1d7bca5 100644
--- a/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc
+++ b/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc
@@ -63,7 +63,7 @@ project(Satellite_exec) : ciao_component {
 
 project (Satellite_controller) : ciao_client, valuetype {
   exename = controller
-  after += Satellite_stub
+  after += Satellite_stub Satellite_exec
   libs += Satellite_stub BBN_UAV_stub
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/UAV/Satellite/controller.cpp b/TAO/CIAO/examples/UAV/Satellite/controller.cpp
index dd78b69d2e1..87a18d940a4 100644
--- a/TAO/CIAO/examples/UAV/Satellite/controller.cpp
+++ b/TAO/CIAO/examples/UAV/Satellite/controller.cpp
@@ -8,7 +8,7 @@
 
 #include "SatelliteC.h"
 #include "ace/Get_Opt.h"
-#include "ace/Streams.h"
+#include <iostream>
 
 char *satellite_ior_ = 0;
 
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "Who is the culprit \n");
-      cerr << "Uncaught CORBA exception" << endl;
+      std::cerr << "Uncaught CORBA exception" << std::endl;
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc
index 5779137eacf..420410234a2 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc
@@ -16,6 +16,9 @@ project(Assembly_Manager): ciao_server, acexml, iortable, rtcorba {
 }
 
 project(Assembly_Deployer) : ciao_server {
+
+  libs += CIAO_XML_Helpers CIAO_Events
+
   Source_Files {
     Assembly_ServiceC.cpp
     Assembly_Deployer.cpp
diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc b/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc
index 85bf8876504..8332a934952 100644
--- a/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc
+++ b/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc
@@ -1,12 +1,18 @@
 // $Id$
 
 project(ComponentServer): ciao_server, iortable {
+
+  libs += CIAO_XML_Helpers CIAO_Events
+
   Source_Files {
     ComponentServer.cpp
   }
 }
 
 project(ComponentServer_test_client) : ciao_server {
+
+  libs += CIAO_XML_Helpers CIAO_Events
+
   Source_Files {
     ComponentServer_test_client.cpp
   }
diff --git a/TAO/CIAO/tools/Daemon/Daemon.mpc b/TAO/CIAO/tools/Daemon/Daemon.mpc
index 9df4271a1fa..888095a0306 100644
--- a/TAO/CIAO/tools/Daemon/Daemon.mpc
+++ b/TAO/CIAO/tools/Daemon/Daemon.mpc
@@ -1,4 +1,7 @@
 project(CIAO_Daemon): ciao_server, iortable {
+
+  libs += CIAO_Events
+  
   IDL_Files {
     Daemon.idl
   }
@@ -14,7 +17,7 @@ project(CIAO_Daemon): ciao_server, iortable {
 project(DaemonController) : ciao_server, acexml, rtcorba {
 
   libs += CIAO_XML_Helpers
-  libpaths += ../XML_Helpers
+  libpaths += ../XML_Helpers CIAO_Events
   after += XML_Helpers
 
   IDL_Files {
diff --git a/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc b/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc
index 4cb3912033d..6b791338742 100644
--- a/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc
+++ b/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc
@@ -1,10 +1,16 @@
 project(ServerActivator): ciao_server, iortable {
+
+  libs += CIAO_XML_Helpers CIAO_Events
+
   Source_Files {
     ServerActivator.cpp
   }
 }
 
 project(ServerActivator_test_client) : ciao_server {
+
+  libs += CIAO_XML_Helpers CIAO_Events
+
   Source_Files {
     ServerActivator_test_client.cpp
   }
diff --git a/TAO/CIAO/tools/tools.mwc b/TAO/CIAO/tools/tools.mwc
index 0e44f57b774..9e697977ac3 100644
--- a/TAO/CIAO/tools/tools.mwc
+++ b/TAO/CIAO/tools/tools.mwc
@@ -2,4 +2,7 @@
 // $Id$
 
 workspace {
-}
\ No newline at end of file
+  exclude {
+    Simple_Component_Server
+  } 
+}