*** empty log message ***EC_integration_stage_0

10 files changed, 27 insertions, 17 deletions

diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 148c9032c8c..40b37ab6094 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -90,8 +90,6 @@ 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_RTEvent.cpp b/TAO/CIAO/ciao/CIAO_RTEvent.cpp
index a559eaab2d9..a2bb4c06f0b 100644
--- a/TAO/CIAO/ciao/CIAO_RTEvent.cpp
+++ b/TAO/CIAO/ciao/CIAO_RTEvent.cpp
@@ -191,7 +191,7 @@ namespace CIAO
       CORBA::SystemException))
   {
 
-    //ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventService::push_event\n"));
+    ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventService::push_event\n"));
 
     RtecEventComm::EventSet events (1);
     events.length (1);
@@ -235,7 +235,7 @@ namespace CIAO
   RTEventServiceConsumer_impl::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    //ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventServiceConsumer_impl::push\n"));
+    ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventServiceConsumer_impl::push\n"));
 
     for (size_t i = 0; i < events.length (); ++i)
       {
diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp
index b9614ec29b8..2938b2557ba 100644
--- a/TAO/CIAO/ciao/Container_Base.cpp
+++ b/TAO/CIAO/ciao/Container_Base.cpp
@@ -194,10 +194,10 @@ CIAO::Container::push_event (
     CORBA::SystemException))
 {
 
-  //ACE_DEBUG ((LM_DEBUG, "CIAO::Container::push_event\n"));
+  ACE_DEBUG ((LM_DEBUG, "CIAO::Container::push_event\n"));
 
   CIAO::EventServiceBase * event_service;
-  // ACE_DEBUG ((LM_DEBUG, "Pushing from supplier id: %s\n", connection_id));
+  ACE_DEBUG ((LM_DEBUG, "Pushing from supplier id: %s\n", connection_id));
   if (this->event_service_map_.find (connection_id, event_service) != 0)
     {
       ACE_THROW (
diff --git a/TAO/CIAO/examples/UAV/Satellite/Satellite_exec.cpp b/TAO/CIAO/examples/UAV/Satellite/Satellite_exec.cpp
index 18a2d45b304..37ab3415f17 100644
--- a/TAO/CIAO/examples/UAV/Satellite/Satellite_exec.cpp
+++ b/TAO/CIAO/examples/UAV/Satellite/Satellite_exec.cpp
@@ -29,7 +29,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
   static int count = 0;
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
-  //ACE_DEBUG ((LM_DEBUG, "UAV RTT = %i\n", end - start_));
+  ACE_DEBUG ((LM_DEBUG, "UAV RTT = %i\n", end - start_));
   this->UAV_times_[count++] = end - this->start_;
 
 
@@ -43,7 +43,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
   static int count = 0;
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
-  //ACE_DEBUG ((LM_DEBUG, "UCAV RTT = %i\n", end - start_));
+  ACE_DEBUG ((LM_DEBUG, "UCAV RTT = %i\n", end - start_));
   this->UCAV_times_[count++] = end - this->start_;
 
 }
@@ -55,7 +55,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
-  //ACE_DEBUG ((LM_DEBUG, "Battle RTT = %i\n", end - start_));
+  ACE_DEBUG ((LM_DEBUG, "Battle RTT = %i\n", end - start_));
 
   this->Battle_times_[this->counter_] = end - this->start_;
 
@@ -104,7 +104,7 @@ MyImpl::Satellite_exec_i::alert (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->start_ = ACE_OS::gethrtime ();
       this->context_->push_target_located (ev.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
     }
 }
 
diff --git a/TAO/CIAO/examples/UAV/Satellite/controller.cpp b/TAO/CIAO/examples/UAV/Satellite/controller.cpp
index e6ba5c27f82..2d0a81a82ad 100644
--- a/TAO/CIAO/examples/UAV/Satellite/controller.cpp
+++ b/TAO/CIAO/examples/UAV/Satellite/controller.cpp
@@ -73,6 +73,7 @@ main (int argc, char *argv[])
       for (int i = 0; i < 1001; ++i)
         {
           sat->alert (ACE_ENV_SINGLE_ARG_PARAMETER);
+	  std::cerr << "Pushed fine... " << std::endl;
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/CIAO/examples/UAV/descriptors/two_host.dat b/TAO/CIAO/examples/UAV/descriptors/two_host.dat
index 47c14f837e7..6abf4efa7fe 100644
--- a/TAO/CIAO/examples/UAV/descriptors/two_host.dat
+++ b/TAO/CIAO/examples/UAV/descriptors/two_host.dat
@@ -1,2 +1,2 @@
-CAOCHost corbaloc:iiop:pc105.emulab.net:20000/ServerActivator
-SatelliteHost corbaloc:iiop:pc143.emulab.net:20000/ServerActivator
+CAOCHost corbaloc:iiop:pc106.emulab.net:20000/ServerActivator
+SatelliteHost corbaloc:iiop:pc151.emulab.net:20000/ServerActivator
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
index 81362960494..c9abaffe0b6 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
@@ -331,6 +331,8 @@ CIAO::Assembly_Impl::make_connections (ACE_ENV_SINGLE_ARG_DECL)
 
         case CIAO::Assembly_Connection::PUBLISHER_CONSUMER:
           {
+	    ACE_DEBUG ((LM_DEBUG, "case CIAO::Assembly_Connection::PUBLISHER_CONSUMER:!!!!\n"));
+
             Components::CCMObject_var sink
               = this->resolve_component (connection->dest_iface_->nested_resolver ()
                                          ACE_ENV_ARG_PARAMETER);
@@ -356,10 +358,17 @@ CIAO::Assembly_Impl::make_connections (ACE_ENV_SINGLE_ARG_DECL)
               ACE_DEBUG ((LM_DEBUG, "Nil source\n"));
 
             Components::Deployment::Container_var container;
-            this->assembly_context_.containers_.find (connection->src_comp_->resolver_info (),
+            
+	    if (this->assembly_context_.containers_.find (connection->src_comp_->resolver_info (),
+                                                      container
+							  ACE_ENV_ARG_PARAMETER) == -1)
+	      ACE_DEBUG ((LM_DEBUG, "Nil container is found!!!!\n"));
+
+	    this->assembly_context_.containers_.find (connection->src_comp_->resolver_info (),
                                                       container
                                                       ACE_ENV_ARG_PARAMETER);
             ACE_CHECK;
+	    container->_add_ref ();
 
             CIAO::ContainerEventService_var event_service =
               container->get_event_service (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -423,6 +432,8 @@ CIAO::Assembly_Impl::make_connections (ACE_ENV_SINGLE_ARG_DECL)
             consumer_config->destroy (ACE_ENV_SINGLE_ARG_DECL);
             ACE_CHECK;
 
+	    ACE_DEBUG ((LM_DEBUG, "case OUT OF CASE STATEMENT: CIAO::Assembly_Connection::PUBLISHER_CONSUMER:!!!!\n"));
+
           }
           break;
 
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.cpp
index 5d2e85c3132..e80b9044c12 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.cpp
@@ -278,7 +278,7 @@ CIAO::Assembly_Builder_Visitor::visit_componentinstantiation
                                                 comp);
 
   this->context_.containers_.bind (ci->id (),
-                                   this->container_.in ());
+                                   Components::Deployment::Container::_duplicate (this->container_.in ()));
 
   // Registering component.
   CIAO::Assembly_Placement::componentinstantiation::REGISTRATION_QUEUE::ITERATOR
diff --git a/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.mpc b/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.mpc
index eb1f0b5c800..127f20a4c3f 100644
--- a/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.mpc
+++ b/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.mpc
@@ -14,7 +14,7 @@ project (Simple_Server_Stub) : taolib_with_idl, ciao_client {
 
 project (Simple_Component_Server) : ciao_server {
   after += Simple_Server_Stub
-  libs += CIAO_Simple_Server_Stub
+  libs += CIAO_Simple_Server_Stub CIAO_Events
   exename = Simple_Component_Server
 
   Source_Files {
@@ -27,7 +27,7 @@ project (Simple_Component_Server) : ciao_server {
 // Use the following settings as a blueprint for creating client project.
 project (Simple_Component_Server_test_client) : ciao_server {
   after += Simple_Server_Stub
-  libs += CIAO_Simple_Server_Stub
+  libs += CIAO_Simple_Server_Stub CIAO_Events
   libpaths += $(CIAO_ROOT)/tools/Simple_Component_Server
   exename = sample_client
 
diff --git a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
index 15deed2c5ee..b1772c5e181 100644
--- a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
+++ b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
@@ -19,7 +19,7 @@ project(XML_Helpers): taolib_with_idl, rtcorba, portableserver, acexml {
     Cascadable_DocHandler.cpp
     Assembly_Spec.cpp
     Assembly_Handlers.cpp
-    Event_Handlers.cpp
+//    Event_Handlers.cpp
   }
 }