ChangeLogTag: Wed Mar 14 16:14:31 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

6 files changed, 50 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3373250cc3e..6f1e67c7e80 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Wed Mar 14 16:14:31 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/Bug_2800_Regression/client.cpp:
+
+          Corrected debug message.
+
+        * performance-tests/Throughput/Throughput.mpc:
+
+          Reverted my change from Tue Mar 13 18:24:27 UTC 2007.  It should
+          not have been committed.
+
+        * examples/ior_corbaloc/server.cpp:
+        * tests/IDL_Test/main.cpp:
+        * tests/Multiple/server.cpp:
+
+          Modified these tests to use explicit activation to support
+          CORBA e compact.
+
 Wed Mar 14 13:38:15 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
         * tests/Servant_To_Reference_Test/run_test.pl:
diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp
index af4cf921000..701627d158a 100644
--- a/TAO/examples/ior_corbaloc/server.cpp
+++ b/TAO/examples/ior_corbaloc/server.cpp
@@ -39,8 +39,13 @@ int main (int argc, char* argv[])
       corbaloc_Status_i status_i;
       status_i.set_name (argv[1]);
       // Activate it to obtain the reference
+      PortableServer::ObjectId_var id =
+        poa->activate_object (&status_i);
+
+      CORBA::Object_var object = poa->id_to_reference (id.in ());
+
       corbaloc::Status_var status =
-        status_i._this ();
+        corbaloc::Status::_narrow (object.in ());
 
       // Get a reference to Naming Context
       CORBA::Object_var naming_context_object =
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
index 31eaafb1abb..cfaedd2ea24 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
@@ -86,7 +86,7 @@ main (int argc, char *argv[])
         }
       catch (const CosNaming::NamingContext::CannotProceed&)
         {
-          ACE_DEBUG ((LM_DEBUG, "Catched correct exception\n"));
+          ACE_DEBUG ((LM_DEBUG, "Caught correct exception\n"));
         }
 
       if (shutdown_nsmain)
diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc
index febd63f91ed..e0baa06c094 100644
--- a/TAO/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/performance-tests/Throughput/Throughput.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, avoids_corba_e_compact {
+project(*idl): taoidldefaults {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*server): taoserver, strategies, avoids_corba_e_compact {
+project(*server): taoserver, strategies {
   after += *idl
   Source_Files {
     TestC.cpp
@@ -21,7 +21,7 @@ project(*server): taoserver, strategies, avoids_corba_e_compact {
   }
 }
 
-project(*client): taoclient, strategies, avoids_corba_e_compact {
+project(*client): taoclient, strategies {
   after += *idl
   Source_Files {
     TestC.cpp
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index 52b623edf02..c0fd63e717a 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -106,7 +106,9 @@ main (int argc , char *argv[])
       CORBA::Object_var obj;
 
       hello_i h;
-      obj = h._this ();
+      PortableServer::ObjectId_var id = root_poa->activate_object (&h);
+      obj = root_poa->id_to_reference (id.in ());
+      obj = hello::_narrow (obj.in ());
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/hello:1.0"))
@@ -117,7 +119,9 @@ main (int argc , char *argv[])
         }
 
       goodbye_i g;
-      obj = g._this ();
+      id = root_poa->activate_object (&g);
+      obj = root_poa->id_to_reference (id.in ());
+      obj = goodbye::_narrow (obj.in ());
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/goodbye:1.0"))
@@ -128,7 +132,9 @@ main (int argc , char *argv[])
         }
 
       sayonara_i s;
-      obj = s._this ();
+      id = root_poa->activate_object (&s);
+      obj = root_poa->id_to_reference (id.in ());
+      obj = salutation::sayonara::_narrow (obj.in ());
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:hammer.com/salutation/sayonara:1.0"))
@@ -139,7 +145,9 @@ main (int argc , char *argv[])
         }
 
       ciao_i c;
-      obj = c._this ();
+      id = root_poa->activate_object (&c);
+      obj = root_poa->id_to_reference (id.in ());
+      obj = ciao::_narrow (obj.in ());
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/ciao:1.0"))
@@ -150,7 +158,9 @@ main (int argc , char *argv[])
         }
 
       aloha_i a;
-      obj = a._this ();
+      id = root_poa->activate_object (&a);
+      obj = root_poa->id_to_reference (id.in ());
+      obj = aloha::_narrow (obj.in ());
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/aloha:1.0"))
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index 7ed7d823af7..cb292790c4c 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -28,15 +28,16 @@ int main (int argc, char *argv[])
 
       // Create the delegated servant and intialize it
       // with the "real" servant.
-      Delegated_Bottom_Impl delegated_servant(servant._this (),
-                                              orb.in ());
+      PortableServer::ObjectId_var id = poa->activate_object (&servant);
+      CORBA::Object_var object_act = poa->id_to_reference (id.in ());
+      Delegated_Bottom_Impl delegated_servant(
+                              Multiple::Bottom::_narrow (object_act.in ()),
+                              orb.in ());
 
       // Create the CORBA Object that is incarnated by the
       // delegated servant.
-      PortableServer::ObjectId_var id =
-        poa->activate_object (&delegated_servant);
-
-      CORBA::Object_var object_act = poa->id_to_reference (id.in ());
+      id = poa->activate_object (&delegated_servant);
+      object_act = poa->id_to_reference (id.in ());
 
       Multiple::Bottom_var bottom =
         Multiple::Bottom::_narrow (object_act.in ());