*** empty log message ***EC_integration_DAnCE

4 files changed, 27 insertions, 32 deletions

diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index d36da4e8ca7..5ecf908ca9a 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -648,16 +648,14 @@ get_outgoing_connections_i (const char * instname,
   {
     CORBA::ULong len = retv.length ();
 
-    // Current connection that we are looking at.
+    // Current plan connection description that we are looking at.
     const Deployment::PlanConnectionDescription & curr_conn =
       this->plan_.connection[i];
 
     //The modeling tool should make sure there are always 2 endpoints
     //in a connection.
     const CORBA::ULong curr_conn_len = curr_conn.internalEndpoint.length ();
-    for (CORBA::ULong p_index = 0;
-         p_index < curr_conn_len;
-         ++p_index)
+    for (CORBA::ULong p_index = 0; p_index < curr_conn_len; ++p_index)
     {
       const Deployment::PlanSubcomponentPortEndpoint & endpoint =
         curr_conn.internalEndpoint[p_index];
@@ -708,16 +706,14 @@ get_outgoing_connections_i (const char * instname,
                     retv[len].kind = endpoint.kind; // either emitter/publisher or receptacle.
                     retv[len].endpoint = CORBA::Object::_duplicate(curr_rev_conn.endpoint.in ());
 
-                    // CIAO-specific fields below
-                    // If the component port type needs to use CIAO specific publish/subscribe
+                    // CIAO-specific extension fields below
+                    // If the component port type needs to use CIAO specific publisher/subscriber
                     // service, then we also need to set up the "consumer side component name"
-                    // and "consumer side port name".
+                    // and "consumer side port name" and "consumer side end point".
                     if (retv[len].kind == Deployment::rtecEventPublisher ||
                         retv[len].kind == Deployment::rtecEventEmitter ||
                         retv[len].kind == Deployment::EventPublisher ||
-                        retv[len].kind == Deployment::EventEmitter ||
-                        retv[len].kind == Deployment::nsEventPublisher ||
-                        retv[len].kind == Deployment::nsEventEmitter)
+                        retv[len].kind == Deployment::EventEmitter)
                       {
                         retv[len].consumerCompName = name.c_str ();
                         retv[len].consumerPortName = port_name.c_str ();
diff --git a/TAO/CIAO/DAnCE/ciao/CIAO_DirectEvent.cpp b/TAO/CIAO/DAnCE/ciao/CIAO_DirectEvent.cpp
index 93ef82fbdce..9fdaecffbee 100644
--- a/TAO/CIAO/DAnCE/ciao/CIAO_DirectEvent.cpp
+++ b/TAO/CIAO/DAnCE/ciao/CIAO_DirectEvent.cpp
@@ -85,9 +85,7 @@ namespace CIAO
     // Iterate through the array, pushing the event to each consumer.
     for (size_t iter = 0; iter != end; ++iter)
       {
-        // @@ George, is this required? Since the push_event () is
-        // going to make a copy, why would this be required?
-        ev->_add_ref ();
+        ev->_add_ref (); // Is this needed or not?
         this->consumer_array_[iter]->push_event (
           ev
           ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/CIAO/DAnCE/ciao/CIAO_DirectEvent.h b/TAO/CIAO/DAnCE/ciao/CIAO_DirectEvent.h
index edf400f4114..8df768b7e24 100644
--- a/TAO/CIAO/DAnCE/ciao/CIAO_DirectEvent.h
+++ b/TAO/CIAO/DAnCE/ciao/CIAO_DirectEvent.h
@@ -42,26 +42,26 @@ namespace CIAO
 
     virtual void connect_event_supplier (
         CIAO::Supplier_Config_ptr supplier_config
-        ACE_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException));
 
     virtual void connect_event_consumer (
         CIAO::Consumer_Config_ptr consumer_config
-        ACE_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException));
 
     virtual void disconnect_event_consumer (
         const char * connection_id
-        ACE_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         Components::InvalidName,
         Components::InvalidConnection));
 
     virtual void disconnect_event_supplier (
-        ACE_ENV_SINGLE_ARG_DECL)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         Components::InvalidName,
@@ -69,7 +69,7 @@ namespace CIAO
 
     virtual void push_event (
         Components::EventBase * ev
-        ACE_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException));
 
@@ -112,30 +112,30 @@ namespace CIAO
     virtual ~Direct_Consumer_Config_impl (void);
 
     virtual void consumer_id (const char * consumer_id
-                              ACE_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual CONNECTION_ID consumer_id (ACE_ENV_SINGLE_ARG_DECL)
+    virtual CONNECTION_ID consumer_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void supplier_id (const char * supplier_id
                               ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual CONNECTION_ID supplier_id (ACE_ENV_SINGLE_ARG_DECL)
+    virtual CONNECTION_ID supplier_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void consumer (Components::EventConsumerBase_ptr consumer ACE_ENV_ARG_DECL)
+    virtual void consumer (Components::EventConsumerBase_ptr consumer ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual Components::EventConsumerBase_ptr consumer (ACE_ENV_SINGLE_ARG_DECL)
+    virtual Components::EventConsumerBase_ptr consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // @@ george, probably this should be const'ified?
-    virtual EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL)
+    virtual EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -171,16 +171,16 @@ namespace CIAO
 
     virtual ~Direct_Supplier_Config_impl (void);
 
-    void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL)
+    void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    char * supplier_id (ACE_ENV_SINGLE_ARG_DECL)
+    char * supplier_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL)
+    EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
index fb5de013b70..2b5a80c8e31 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
@@ -642,14 +642,15 @@ CIAO::NodeApplication_Impl::build_event_connection (const Deployment::Connection
 
     // Get the consumer component object reference.
     ACE_CString consumer_comp_name = connection.consumerCompName.in ();
-    Components::CCMObject_ptr sink_objref;
+//    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, "consumer 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 =