ChangeLogTag:Tue May 2 12:05:07 2000 Carlos O'Ryan <coryan@uci.edu>

4 files changed, 265 insertions, 109 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index e76c49c1a6b..9e8efa1ba5d 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,21 @@
+Tue May  2 12:05:07 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
+          Fixed nasty bug in the event channel gateways.  The local
+          consumer proxy map was not recomputed correctly, because I was
+          invoking Map_Manager::close() to reset the map.  This method
+          resets the map, but it leaves it in an incosistent state,
+          Map_Manager::open() does the right thing.  IMnsHO extremely
+          counter intuitive.
+          Thanks to Ron Klein <rklein@west.raytheon.com> for reporting the
+          bug and providing a test for it.
+
+        * orbsvcs/tests/Event/Basic/Gateway.cpp:
+          Extended the regression test to include Ron's use-case.
+
+        * tests/AMI/Makefile:
+          Updated dependencies.
+
 Tue May  2 10:24:10 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp:
@@ -29,10 +47,10 @@ Mon May  1 21:12:07 2000  Carlos O'Ryan  <coryan@uci.edu>
 
 Mon May  1 19:20:04 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
-	* TAO_IDL/be/be_interface.cpp:
-	  Another try at getting all compilers happy with the
-	  generated code in _tao_QueryInterface in 
-	  nested_scopesC.cpp in IDL_Test.
+        * TAO_IDL/be/be_interface.cpp:
+          Another try at getting all compilers happy with the
+          generated code in _tao_QueryInterface in
+          nested_scopesC.cpp in IDL_Test.
 
 Mon May  1 14:32:11 2000  Marina Spivak  <marina@cs.wustl.edu>
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 3b382128bd7..3f4ba2d2008 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -160,7 +160,9 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV)
           CORBA::release (consumer);
           ACE_CHECK;
         }
-      this->consumer_proxy_map_.close ();
+      // Remove all the elements on the map.  Calling close() does not
+      // work because the map is left in an inconsistent state.
+      this->consumer_proxy_map_.open ();
     }
 
   if (!CORBA::is_nil (this->default_consumer_proxy_.in ()))
@@ -215,7 +217,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
       || CORBA::is_nil (this->rmt_ec_.in ()))
     return;
 
-  // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Open gateway\n"));
+  // ACE_DEBUG ((LM_DEBUG, "ECG (%t) update_consumer_i \n"));
 
   // = Connect as a supplier to the local EC
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
@@ -232,17 +234,37 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
       sub.dependencies[i].rt_info = this->rmt_info_;
 
       RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = 0;
-      RtecEventComm::EventSourceID sid =
-        sub.dependencies[i].event.header.source;
-      if (sid != 0
-          && this->consumer_proxy_map_.find (sid, proxy) == -1)
+      const RtecEventComm::EventHeader &h =
+        sub.dependencies[i].event.header;
+
+      RtecEventComm::EventSourceID sid = h.source;
+
+      // ACE_DEBUG ((LM_DEBUG,
+      //            "ECG (%t)    trying (%d,%d)\n",
+      //            sid, h.type));
+
+      // Skip all subscriptions that do not require an specific source
+      // id.
+      if (sid == 0)
+        continue;
+
+      // Skip all the magic event types.
+      if (0 < h.type && h.type < ACE_ES_EVENT_UNDEFINED)
+        continue;
+
+      if (this->consumer_proxy_map_.find (sid, proxy) == -1)
         {
+          // ACE_DEBUG ((LM_DEBUG,
+          //             "ECG (%t)    binding source %d\n",
+          //             sid));
           proxy = supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
           ACE_CHECK;
           this->consumer_proxy_map_.bind (sid, proxy);
         }
     }
-
+  // ACE_DEBUG ((LM_DEBUG,
+  //             "ECG (%t)    consumer map computed (%d entries)\n",
+  //             this->consumer_proxy_map_.current_size ()));
 
   if (this->consumer_proxy_map_.current_size () > 0)
     {
@@ -261,9 +283,16 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
            ++j)
         {
           RtecEventChannelAdmin::SupplierQOS pub;
-          pub.publications.length (sub.dependencies.length ());
+          pub.publications.length (sub.dependencies.length () + 1);
           pub.is_gateway = 1;
-          int c = 0;
+
+          pub.publications[0].event.header.type =
+            ACE_ES_DISJUNCTION_DESIGNATOR;
+          pub.publications[0].dependency_info.dependency_type =
+            RtecScheduler::TWO_WAY_CALL;
+          pub.publications[0].dependency_info.number_of_calls = 1;
+          pub.publications[0].dependency_info.rt_info = this->lcl_info_;
+          int c = 1;
 
           RtecEventComm::EventSourceID sid = (*j).ext_id_;
           for (CORBA::ULong k = 0; k < sub.dependencies.length (); ++k)
@@ -271,7 +300,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
               const RtecEventComm::EventHeader& h =
                 sub.dependencies[k].event.header;
               if (h.source != sid
-                  || (1 <= h.type
+                  || (0 < h.type
                       && h.type < ACE_ES_EVENT_UNDEFINED))
                 continue;
               pub.publications[c].event.header = h;
@@ -281,9 +310,16 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
               pub.publications[c].dependency_info.rt_info = this->lcl_info_;
               c++;
             }
-          if (c == 0)
+          // ACE_DEBUG ((LM_DEBUG,
+          //             "ECG (%t) supplier id %d has %d elements\n",
+          //             sid, c));
+          if (c == 1)
             continue;
 
+
+          // The prefix filter builder needs to know the number of
+          // elements in the disjunction
+          pub.publications[0].event.header.source = c - 1;
           pub.publications.length (c);
           (*j).int_id_->connect_push_supplier (supplier_ref.in (),
                                                pub,
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index 8452cc8da73..4f167a05faa 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -148,7 +148,7 @@ main (int argc, char* argv[])
       {
         ACE_ConsumerQOS_Factory consumer_qos;
         consumer_qos.start_disjunction_group (1);
-        consumer_qos.insert_type (event_type, 0);
+        consumer_qos.insert (event_source, event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
                              consumer_qos.get_ConsumerQOS (),
@@ -167,16 +167,107 @@ main (int argc, char* argv[])
 
       CORBA::ULong expected =
         supplier_00.event_count;
-      CORBA::ULong discarded =
-        supplier_01.event_count;
       consumer_00.dump_results (expected, 5);
 
+      CORBA::ULong last_count = consumer_00.event_count;
+      CORBA::ULong last_supplier_00 = supplier_00.event_count;
+      CORBA::ULong last_supplier_01 = supplier_01.event_count;
+
       // ****************************************************************
 
       {
         ACE_ConsumerQOS_Factory consumer_qos;
         consumer_qos.start_disjunction_group (2);
+        consumer_qos.insert (event_source, event_type,     0);
+        consumer_qos.insert (event_source, event_type + 1, 0);
+
+        consumer_00.connect (consumer_admin_2.in (),
+                             consumer_qos.get_ConsumerQOS (),
+                             ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+      }
+
+      // ****************************************************************
+
+      tv = ACE_Time_Value (5, 0);
+      orb->run (tv);
+
+      expected = last_count
+        + supplier_00.event_count - last_supplier_00
+        + supplier_01.event_count - last_supplier_01;
+      consumer_00.dump_results (expected, 5);
+
+      last_count = consumer_00.event_count;
+      last_supplier_00 = supplier_00.event_count;
+      last_supplier_01 = supplier_01.event_count;
+
+      // ****************************************************************
+
+      {
+        ACE_ConsumerQOS_Factory consumer_qos;
+        consumer_qos.start_disjunction_group (1);
+        consumer_qos.insert (event_source, event_type, 0);
+
+        consumer_00.connect (consumer_admin_2.in (),
+                             consumer_qos.get_ConsumerQOS (),
+                             ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+      }
+
+      // ****************************************************************
+
+      tv = ACE_Time_Value (5, 0);
+      orb->run (tv);
+
+      expected = last_count
+        + supplier_00.event_count - last_supplier_00;
+      consumer_00.dump_results (expected, 5);
+
+      last_count = consumer_00.event_count;
+      last_supplier_00 = supplier_00.event_count;
+      last_supplier_01 = supplier_01.event_count;
+
+      // ****************************************************************
+
+      consumer_00.disconnect (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // ****************************************************************
+
+      {
+        ACE_ConsumerQOS_Factory consumer_qos;
+        consumer_qos.start_disjunction_group (1);
         consumer_qos.insert_type (event_type, 0);
+
+        consumer_00.connect (consumer_admin_2.in (),
+                             consumer_qos.get_ConsumerQOS (),
+                             ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+      }
+
+      // ****************************************************************
+
+      tv = ACE_Time_Value (5, 0);
+      // Wait for events, using work_pending()/perform_work() may help
+      // or using another thread, this example is too simple for that.
+      orb->run (tv);
+
+      // ****************************************************************
+
+      expected = last_count
+        + supplier_00.event_count - last_supplier_00;
+      consumer_00.dump_results (expected, 5);
+
+      last_count = consumer_00.event_count;
+      last_supplier_00 = supplier_00.event_count;
+      last_supplier_01 = supplier_01.event_count;
+
+      // ****************************************************************
+
+      {
+        ACE_ConsumerQOS_Factory consumer_qos;
+        consumer_qos.start_disjunction_group (2);
+        consumer_qos.insert_type (event_type,     0);
         consumer_qos.insert_type (event_type + 1, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
@@ -190,13 +281,14 @@ main (int argc, char* argv[])
       tv = ACE_Time_Value (5, 0);
       orb->run (tv);
 
-      expected =
-        supplier_00.event_count
-        + supplier_01.event_count - discarded;
+      expected = last_count
+        + supplier_00.event_count - last_supplier_00
+        + supplier_01.event_count - last_supplier_01;
       consumer_00.dump_results (expected, 5);
 
-      CORBA::ULong last_count = expected;
-      CORBA::ULong last_supplier_00 = supplier_00.event_count;
+      last_count = consumer_00.event_count;
+      last_supplier_00 = supplier_00.event_count;
+      last_supplier_01 = supplier_01.event_count;
 
       // ****************************************************************
 
@@ -216,10 +308,14 @@ main (int argc, char* argv[])
       tv = ACE_Time_Value (5, 0);
       orb->run (tv);
 
-      expected = last_count +
-        supplier_00.event_count - last_supplier_00;
+      expected = last_count
+        + supplier_00.event_count - last_supplier_00;
       consumer_00.dump_results (expected, 5);
 
+      last_count = consumer_00.event_count;
+      last_supplier_00 = supplier_00.event_count;
+      last_supplier_01 = supplier_01.event_count;
+
       // ****************************************************************
 
       consumer_00.disconnect (ACE_TRY_ENV);
diff --git a/TAO/tests/AMI/Makefile b/TAO/tests/AMI/Makefile
index 81d9ee68f05..e96e81078ee 100644
--- a/TAO/tests/AMI/Makefile
+++ b/TAO/tests/AMI/Makefile
@@ -166,10 +166,14 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Sequence.h \
@@ -180,31 +184,20 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/InterfaceC.h \
- $(TAO_ROOT)/tao/ifrfwd.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/InterfaceC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/Smart_Proxies.h \
  $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -250,6 +243,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -301,11 +304,11 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
  ami_testC.h \
@@ -344,8 +347,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/ImplRepoC.h \
- $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
@@ -618,8 +619,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/ImplRepoC.h \
- $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -658,9 +657,9 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
@@ -675,6 +674,9 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
@@ -930,8 +932,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/ImplRepoC.h \
- $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -970,9 +970,9 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
@@ -987,6 +987,9 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
@@ -1207,8 +1210,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/ImplRepoC.h \
- $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -1268,9 +1269,9 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
@@ -1285,6 +1286,9 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
@@ -1385,10 +1389,14 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Sequence.h \
@@ -1399,31 +1407,20 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/InterfaceC.h \
- $(TAO_ROOT)/tao/ifrfwd.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/InterfaceC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/Smart_Proxies.h \
  $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1469,6 +1466,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -1520,11 +1527,11 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
  ami_testC.h \
@@ -1563,8 +1570,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/ImplRepoC.h \
- $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
@@ -1683,10 +1688,14 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Sequence.h \
@@ -1697,31 +1706,20 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/InterfaceC.h \
- $(TAO_ROOT)/tao/ifrfwd.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/InterfaceC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/Smart_Proxies.h \
  $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1767,6 +1765,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -1818,11 +1826,11 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
  ami_testC.h \
@@ -1861,8 +1869,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/ImplRepoC.h \
- $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \