*** empty log message ***

5 files changed, 51 insertions, 54 deletions

diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index c1c5a482a52..d36da4e8ca7 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -714,8 +714,8 @@ get_outgoing_connections_i (const char * instname,
                     // and "consumer side port name".
                     if (retv[len].kind == Deployment::rtecEventPublisher ||
                         retv[len].kind == Deployment::rtecEventEmitter ||
-                        retv[len].kind == Deployment::ecEventPublisher ||
-                        retv[len].kind == Deployment::ecEventEmitter ||
+                        retv[len].kind == Deployment::EventPublisher ||
+                        retv[len].kind == Deployment::EventEmitter ||
                         retv[len].kind == Deployment::nsEventPublisher ||
                         retv[len].kind == Deployment::nsEventEmitter)
                       {
@@ -751,15 +751,19 @@ dump_connections (const ::Deployment::Connections & connections)
     ACE_DEBUG ((LM_DEBUG, "instanceName: %s\n", connections[i].instanceName.in ()));
     ACE_DEBUG ((LM_DEBUG, "portName: %s\n", connections[i].portName.in ()));
     ACE_DEBUG ((LM_DEBUG, "portkind: "));
+
     switch (connections[i].kind) {
-    case Deployment::Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break;
-    case Deployment::SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break;
-    case Deployment::MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break;
-    case Deployment::EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break;
-    case Deployment::EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break;
-    case Deployment::EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
+      case Deployment::Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break;
+      case Deployment::SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break;
+      case Deployment::MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break;
+      case Deployment::EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break;
+      case Deployment::EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break;
+      case Deployment::EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
     }
 
+    ACE_DEBUG ((LM_DEBUG, "consumerCompName: %s\n", connections[i].consumerCompName.in ()));
+    ACE_DEBUG ((LM_DEBUG, "consumerPortName: %s\n", connections[i].consumerPortName.in ()));
+
     // object reference.
     ACE_DEBUG ((LM_DEBUG, "endpoint: \n"));
   }
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
index c66815ad124..cde5cd011ea 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
@@ -203,7 +203,7 @@ CIAO::Container::push_event (
   ////ACE_DEBUG ((LM_DEBUG, "Pushing from supplier id: %s\n", connection_id));
   if (this->event_service_map_.find (connection_id, event_service) != 0)
     {
-      ACE_DEBUG ((LM_DEBUG, "-----------Invalid Connection: %s ----------\n", connection_id));
+      ACE_DEBUG ((LM_DEBUG, "-----------Invalid Connection_id: %s ----------\n", connection_id));
 
       ACE_THROW (Components::InvalidConnection ());
     }
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
index 287cd2caff7..fb5de013b70 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
@@ -61,38 +61,13 @@ CIAO::NodeApplication_Impl::finishLaunch (
 	          // @@ (GD) A place holder where the Event Channel connections
 	          //         should be set up.
               case Deployment::EventEmitter:
-                consumer = Components::EventConsumerBase::
-                  _narrow (providedReference[i].endpoint.in ()
-                          ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-
-                if (CORBA::is_nil (consumer.in ()))
-                  {
-                    ACE_THROW (Deployment::InvalidConnection ());
-                  }
-
-                comp->connect_consumer(providedReference[i].portName.in (),
-                                       consumer.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-                break;
-
               case Deployment::EventPublisher:
-                consumer = Components::EventConsumerBase::
-                  _narrow (providedReference[i].endpoint.in ()
-                          ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-
-                if (CORBA::is_nil (consumer.in ()))
-				        {              
-				          ACE_THROW (Deployment::InvalidConnection ());
-				        }
-
-                comp->subscribe (providedReference[i].portName.in (),
-                                consumer.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                ACE_DEBUG ((LM_DEBUG, "Building direct connection.\n"));
+                this->build_event_connection (providedReference[i], 
+                                              CIAO::DIRECT
+                                              ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
-                break;
+			          break;
 
 			        case Deployment::rtecEventEmitter:
               case Deployment::rtecEventPublisher:
@@ -626,6 +601,22 @@ CIAO::NodeApplication_Impl::build_event_connection (const Deployment::Connection
 {
 	  ACE_DEBUG ((LM_DEBUG, "CIAO::NodeApplication_Impl::build_connection ()!!!\n"));
 
+    ACE_DEBUG ((LM_DEBUG, "instanceName: %s\n", connection.instanceName.in ()));
+    ACE_DEBUG ((LM_DEBUG, "portName: %s\n", connection.portName.in ()));
+
+    ACE_DEBUG ((LM_DEBUG, "consumer Component Name: %s\n", connection.consumerCompName.in ()));
+    ACE_DEBUG ((LM_DEBUG, "consumer Port Name: %s\n", connection.consumerPortName.in ()));
+
+    ACE_DEBUG ((LM_DEBUG, "portkind: "));
+    switch (connection.kind) {
+      case Deployment::Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break;
+      case Deployment::SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break;
+      case Deployment::MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break;
+      case Deployment::EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break;
+      case Deployment::EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break;
+      case Deployment::EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
+    }
+
     // Get the consumer port object reference and put into "consumer"
     Components::EventConsumerBase_var consumer = 
       Components::EventConsumerBase::_narrow (connection.endpoint.in ()
@@ -638,26 +629,28 @@ CIAO::NodeApplication_Impl::build_event_connection (const Deployment::Connection
         ACE_THROW (Deployment::InvalidConnection ());
       }
 
-    // Get the consumer component object reference.
-    ACE_CString consumer_comp_name = connection.consumerCompName.in ();
-    Components::CCMObject_ptr sink_objref;
-
-    if (this->component_map_.find (consumer_comp_name, sink_objref) != 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Nil sink component object reference\n"));
-        ACE_THROW (Deployment::InvalidConnection ());
-      }
-
     // Get the supplier component object reference.
     ACE_CString supplier_comp_name = connection.instanceName.in ();
     Components::CCMObject_ptr source_objref;
 
+    ACE_DEBUG ((LM_DEBUG, "source component name is: %s\n", supplier_comp_name.c_str ()));
     if (this->component_map_.find (supplier_comp_name, source_objref) != 0)
       {
         ACE_DEBUG ((LM_DEBUG, "Nil source component object reference\n"));
         ACE_THROW (Deployment::InvalidConnection ());
       }
 
+    // Get the consumer component object reference.
+    ACE_CString consumer_comp_name = connection.consumerCompName.in ();
+    Components::CCMObject_ptr sink_objref;
+
+    ACE_DEBUG ((LM_DEBUG, "sink component name is: %s\n", consumer_comp_name.c_str ()));
+    if (this->component_map_.find (consumer_comp_name, sink_objref) != 0)
+      {
+        ACE_DEBUG ((LM_DEBUG, "Nil sink component object reference\n"));
+        ACE_THROW (Deployment::InvalidConnection ());
+      }
+
     // Get the container event service
     CIAO::ContainerEventService_var event_service =
       this->get_event_service (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -674,8 +667,8 @@ CIAO::NodeApplication_Impl::build_event_connection (const Deployment::Connection
     //ACE_DEBUG ((LM_DEBUG, "Nil source component object reference\n"));
     //ACE_CString sid = source_objref->component_UUID (ACE_ENV_SINGLE_ARG_DECL);
 
-      ACE_CString test_sid = source_objref->component_UUID (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_DEBUG ((LM_DEBUG, "The COMPONENT UUID I GOT is: %s\n", test_sid.c_str ()));
+    ACE_CString test_sid = source_objref->component_UUID (ACE_ENV_SINGLE_ARG_DECL);
+    ACE_DEBUG ((LM_DEBUG, "The COMPONENT UUID I GOT is: %s\n", test_sid.c_str ()));
     ACE_CString sid = supplier_comp_name;
     ACE_DEBUG ((LM_DEBUG, "The SUPPLIER COMPONENT NAME is: %s\n", supplier_comp_name.c_str ()));
     ACE_CHECK;
diff --git a/TAO/CIAO/DAnCE/examples/EC_Benchmark/descriptors/DeploymentPlan.cdp b/TAO/CIAO/DAnCE/examples/EC_Benchmark/descriptors/DeploymentPlan.cdp
index d66e88a6401..80c57c501ba 100644
--- a/TAO/CIAO/DAnCE/examples/EC_Benchmark/descriptors/DeploymentPlan.cdp
+++ b/TAO/CIAO/DAnCE/examples/EC_Benchmark/descriptors/DeploymentPlan.cdp
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Deployment:DeploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
 
   <instance>
@@ -8,7 +8,7 @@
 
   <instance>
     <name>Consumer</name>
-    <node>WindowsXP</node>
+    <node>RedHatLinux</node>
   </instance>
 
 </Deployment:DeploymentPlan>
diff --git a/TAO/CIAO/DAnCE/examples/EC_Benchmark/descriptors/deployment.dat b/TAO/CIAO/DAnCE/examples/EC_Benchmark/descriptors/deployment.dat
index 1f736ad6b9c..6b5292d8e7b 100644
--- a/TAO/CIAO/DAnCE/examples/EC_Benchmark/descriptors/deployment.dat
+++ b/TAO/CIAO/DAnCE/examples/EC_Benchmark/descriptors/deployment.dat
@@ -1,2 +1,2 @@
 WindowsXP	corbaloc:iiop:localhost:10000/NodeManager
-RedHatLinux corbaloc:iiop:localhost:20000/NodeManager
\ No newline at end of file
+RedHatLinux	corbaloc:iiop:localhost:20000/NodeManager
\ No newline at end of file