ChangeLogTag:Thu Nov 9 17:54:21 2000 Carlos O'Ryan <coryan@uci.edu>

15 files changed, 127 insertions, 168 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 12c1e01114a..2f26844ddc8 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,31 @@
+Thu Nov  9 17:54:21 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp:
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp:
+        * orbsvcs/tests/Event/Performance/Latency.cpp:
+        * orbsvcs/tests/Event/Performance/Latency_Server.cpp:
+        * tests/Exposed_Policies/client.cpp:
+        * tests/Exposed_Policies/server.cpp:
+        * tests/ORB_destroy/ORB_destroy.cpp:
+        * tests/Portable_Interceptors/Benchmark/interceptors.cpp:
+        * tests/Portable_Interceptors/Dynamic/interceptors.cpp:
+          Fixed warnings and errors in a variety of platforms and/or
+          configurations.  For example: unused variables (or variables not
+          used in release builds), files that could not compile in minimum
+          CORBA builds, and explicit template instantiations for inline=0
+          builds.
+
+        * utils/catior/Makefile:
+        * utils/catior/catior.cpp:
+          Updated to use the new TAO_Strategies library.
+
+        * tao/Makefile:
+          Add missing files to the TEMPLATE_FILES list.
+
+        * release.chk:
+          Removed obsolete file.
+
 Thu Nov  9 17:49:45 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * tao/TAO_Static.dsp:
@@ -6,18 +34,18 @@ Thu Nov  9 17:49:45 2000  Darrell Brunsch <brunsch@uci.edu>
 
 Thu Nov  9 16:22:12 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* tests/InterOp-Naming/Makefile: 
-	  Corrected a typo.
+        * tests/InterOp-Naming/Makefile:
+          Corrected a typo.
 
 Thu Nov  9 15:56:31 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* tao/Strategies/advanced_resource.i: 
-	  Added the missing $Id: string
-	
+        * tao/Strategies/advanced_resource.i:
+          Added the missing $Id: string
+
 Thu Nov  9 14:59:09 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* tao/Strategies/uiop_endpoints.i: 
-	  Corrected TAO_Export to TAO_Strategies_Export.
+        * tao/Strategies/uiop_endpoints.i:
+          Corrected TAO_Export to TAO_Strategies_Export.
 
 Thu Nov  9 14:07:40 2000  Darrell Brunsch <brunsch@uci.edu>
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 1eb7558286a..786fe9581fe 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -1483,7 +1483,7 @@ IMR_Forwarder::postinvoke (const PortableServer::ObjectId &,
                            const char * ,
                            PortableServer::ServantLocator::Cookie ,
                            PortableServer::Servant servant
-                           TAO_ENV_ARG_DECL)
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   delete servant;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
index e6f357901c3..c7d2ccbb5a9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
@@ -434,6 +434,9 @@ template class ACE_Equal_To<CosNotifyFilter::ConstraintID>;
 template class ACE_Array<TAO_Notify_Filter_i::Notify_Constraint_Expr*>;
 template class ACE_Array_Base<TAO_Notify_Filter_i::Notify_Constraint_Expr*>;
 
+template class auto_ptr<CosNotifyFilter::ConstraintInfoSeq>;
+template class ACE_Auto_Basic_Ptr<CosNotifyFilter::ConstraintInfoSeq>;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*>
@@ -448,4 +451,7 @@ template class ACE_Array_Base<TAO_Notify_Filter_i::Notify_Constraint_Expr*>;
 #pragma instantiate ACE_Array<TAO_Notify_Filter_i::Notify_Constraint_Expr*>
 #pragma instantiate ACE_Array_Base<TAO_Notify_Filter_i::Notify_Constraint_Expr*>
 
+#pragma instantiate auto_ptr<CosNotifyFilter::ConstraintInfoSeq>
+#pragma instantiate ACE_Auto_Basic_Ptr<CosNotifyFilter::ConstraintInfoSeq>
+
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 2c80fd41ec5..74a27ebc6c6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -454,7 +454,15 @@ TAO_Trading_Loader::parse_args (int &argc, char *argv [])
 ACE_FACTORY_DEFINE (TAO_Trading, TAO_Trading_Loader)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
 template class ACE_Dynamic_Service<TAO_Trading_Loader>;
+template class auto_ptr<TAO_Trader_Factory::TAO_TRADER>;
+template class ACE_Auto_Basic_Ptr<TAO_Trader_Factory::TAO_TRADER>;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
 #pragma instantiate ACE_Dynamic_Service<TAO_Trading_Loader>
+#pragma instantiate auto_ptr<TAO_Trader_Factory::TAO_TRADER>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Trader_Factory::TAO_TRADER>
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 3bcd0d07a97..028198e2427 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -49,6 +49,7 @@ main (int argc, char *argv [])
         CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+#if (TAO_HAS_MESSAGING == 1)
       CORBA::Object_var manager_object =
         orb->resolve_initial_references ("ORBPolicyManager",
                                          ACE_TRY_ENV);
@@ -73,6 +74,11 @@ main (int argc, char *argv [])
                                             CORBA::SET_OVERRIDE,
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
+#else
+      ACE_DEBUG ((LM_DEBUG,
+                  "CORBA Messaging disabled in this condiguration,"
+                  " test may not be optimally configured\n"));
+#endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 1e247f021e4..cb1037bf925 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -48,6 +48,7 @@ main (int argc, char *argv [])
         CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+#if (TAO_HAS_MESSAGING == 1)
       CORBA::Object_var manager_object =
         orb->resolve_initial_references ("ORBPolicyManager",
                                          ACE_TRY_ENV);
@@ -72,6 +73,11 @@ main (int argc, char *argv [])
                                             CORBA::SET_OVERRIDE,
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
+#else
+      ACE_DEBUG ((LM_DEBUG,
+                  "CORBA Messaging disabled in this condiguration,"
+                  " test may not be optimally configured\n"));
+#endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/release.chk b/TAO/release.chk
deleted file mode 100644
index 2702ea21a5d..00000000000
--- a/TAO/release.chk
+++ /dev/null
@@ -1,125 +0,0 @@
-# $Id$ -*- Picture -*-
- 
-# Hint: use picture-mode to make editing this easier (C-c . will set
-# the direction to "down".
- 
-Legend:
-        Platforms are indicated by position within square brackets, i.e.,
-        [ABCDEF] where
- 
-        A = Solaris/CC
-        B = NT (MSVC++ 5.0)
-        C = Solaris/g++
-        D = IRIX 
-        E = Linux/g++
-        F = Solaric/EGCS
-        G = DEC/cxx
-        H = Other (Linux/egcs, ????) Specify in the NOTES section
- 		   
-        The state is indicated using the following symbols:
- 		   
-        0 = doesn't work
-        1 = works  
-        c = compiles but does not work correctly
-        x = not attempted or unknown
-        P = Purified
- 	           
- A B C D E F G H   
-[x x x x x x x x] libTAO compiles
-[x x x x x x x x] TAO_IDL compiles
-[x x x x x x x x] liborbsvcs compiles
-       	           
-[x x x x x x x x] IDL_Cubit server
-[x x x x x x x x] IDL_Cubit client
-[x x x x x x x x] DII_Cubit client
-       	           
-[x x x x x x x x] Param_Test compiles
-[x x x x x x x x]    SII short
-[x x x x x x x x]    SII ubstring
-[x x x x x x x x]    SII bdstring
-[x x x x x x x x]    SII fixed_struct
-[x x x x x x x x]    SII strseq
-[x x x x x x x x]    SII bounded_strseq
-[x x x x x x x x]    SII var_struct
-[x x x x x x x x]    SII nested_struct
-[x x x x x x x x]    SII struct_seq
-[x x x x x x x x]    SII bounded_struct_seq
-[x x x x x x x x]    SII any
-[x x x x x x x x]    SII objref
-[x x x x x x x x]    SII objref_sequence
-[x x x x x x x x]    SII any_sequence
-[x x x x x x x x]    SII short_sequence
-[x x x x x x x x]    SII long_sequence
-[x x x x x x x x]    SII bounded_short_sequence
-[x x x x x x x x]    SII bounded_long_sequence
-[x x x x x x x x]    SII fixed_array
-[x x x x x x x x]    SII var_array
-       	     
-[x x x x x x x x]    DII short
-[x x x x x x x x]    DII ubstring
-[x x x x x x x x]    DII bdstring
-[x x x x x x x x]    DII fixed_struct
-[x x x x x x x x]    DII strseq
-[x x x x x x x x]    DII bounded_strseq
-[x x x x x x x x]    DII var_struct
-[x x x x x x x x]    DII nested_struct
-[x x x x x x x x]    DII struct_seq
-[x x x x x x x x]    DII bounded_struct_seq
-[x x x x x x x x]    DII any
-[x x x x x x x x]    DII objref
-[x x x x x x x x]    DII objref_sequence
-[x x x x x x x x]    DII any_sequence
-[x x x x x x x x]    DII short_sequence
-[x x x x x x x x]    DII long_sequence
-[x x x x x x x x]    DII bounded_short_sequence
-[x x x x x x x x]    DII bounded_long_sequence
-[x x x x x x x x]    DII fixed_array
-[x x x x x x x x]    DII var_array
-       	     
-[x x x x x x x x] Simple
-[x x x x x x x x] NestedUpcall/Reactor
-[x x x x x x x x] NestedUpcall/Triangle_Test
-[x x x x x x x x] NestedUpcall/MT_Client_Test
-       	     
-[x x x x x x x x] Simple_Naming
-[x x x x x x x x] Event_Latency
-[x x x x x x x x] EC_Throughput
-[x x x x x x x x] EC_Multiple
-[x x x x x x x x] Logger
-       	     
-[x x x x x x x x] MT_Cubit compiles
-[x x x x x x x x] 	runs for Octet
-[x x x x x x x x] 	runs for Short
-[x x x x x x x x] 	runs for Long
-[x x x x x x x x] 	runs for Struct
-       	     
-[x x x x x x x x] POA/RootPOA
-[x x x x x x x x] POA/FindPOA
-[x x x x x x x x] POA/NewPOA
-[x x x x x x x x] POA/Generic_Servant
-[x x x x x x x x] POA/On_Demand_Activation
-[x x x x x x x x] POA/Explicit_Activation
-[x x x x x x x x] POA/Default_Servant
-[x x x x x x x x] Thruput/TAO
-       	   
-NOTES	   
-* Solaris/CC
-	   
-* NT	   
-	   
-* Solaris/g++
-	   
-* IRIX	   
-	   
-* Linux/g++
-	   
-* Solaris/EGCS
-
-* DEC
- 
-* Other (Linux/egcs, Solaris/egcs, etc.)
-
-# eval:(overwrite-mode nil)
-# Local Variables:
-# mode:indented-text
-# End:
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index f7a4d0cdd9d..f7950f67ad4 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -224,7 +224,16 @@ ORB_CORE_FILES = \
 DYNAMIC_ANY_FILES =
 
 TEMPLATE_FILES = \
-  TAO_Singleton
+  Acceptor_Impl \
+  CONV_FRAMES_T \
+  GIOPS_T \
+  IOPS_T \
+  PollableS_T \
+  RTCORBAS_T \
+  Sequence_T \
+  TAOS_T \
+  TAO_Singleton \
+  TimeBaseS_T
 
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp
index ff2dcf07bfa..f4591928b98 100644
--- a/TAO/tests/Exposed_Policies/client.cpp
+++ b/TAO/tests/Exposed_Policies/client.cpp
@@ -34,6 +34,13 @@ main (int argc, char *argv[])
 
   ACE_ENDTRY;
 
+#else
+
+  ACE_UNUSED_ARG(argc);
+  ACE_UNUSED_ARG(argv);
+  ACE_DEBUG ((LM_DEBUG,
+              "Exposed_Policies are disabled on this configuration\n"));
+
 #endif /* (TAO_HAS_RT_CORBA == 1) */
 
   return 0;
diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp
index d6676e81c75..e983a28600a 100644
--- a/TAO/tests/Exposed_Policies/server.cpp
+++ b/TAO/tests/Exposed_Policies/server.cpp
@@ -43,6 +43,13 @@ main (int argc, char *argv[])
 
   ACE_ENDTRY;
 
+#else
+
+  ACE_UNUSED_ARG(argc);
+  ACE_UNUSED_ARG(argv);
+  ACE_DEBUG ((LM_DEBUG,
+              "Exposed_Policies are disabled on this configuration\n"));
+
 #endif /* (TAO_HAS_RT_CORBA == 1) */
 
   return 0;
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp
index f90dfef644d..6fa5d972285 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.cpp
+++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp
@@ -198,5 +198,5 @@ main (int argc, char **argv)
                                           1, 1, 1);
   ACE_ASSERT (result == 0);
 
-  return 0;
+  return result;
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
index 0502fb6c6e7..ebb516eaa36 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
@@ -99,7 +99,7 @@ Vault_Client_Request_Interceptor::receive_reply (
 
 }
 
-void 
+void
 Vault_Client_Request_Interceptor::receive_other (
                PortableInterceptor::ClientRequestInfo_ptr
                TAO_ENV_ARG_DECL_NOT_USED
@@ -130,8 +130,9 @@ Vault_Client_Request_Interceptor::receive_exception (
   CORBA::String_var exception_id =
     rinfo->received_exception_id (ACE_TRY_ENV);
 
-  // Check for exception id mismatch
-  ACE_ASSERT (ACE_OS::strcmp (id, exception_id.in ()) == 0);
+  if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
+    ACE_ERROR ((LM_ERROR, "Mismatched exception ids %s != %s\n",
+                id, exception_id.in ()));
 }
 
 
@@ -201,7 +202,7 @@ Vault_Server_Request_Interceptor::receive_request (
 
 }
 
-void 
+void
 Vault_Server_Request_Interceptor::receive_request_service_contexts (
              PortableInterceptor::ServerRequestInfo_ptr
              TAO_ENV_ARG_DECL_NOT_USED)
@@ -235,7 +236,7 @@ Vault_Server_Request_Interceptor::send_exception (
   // Do Nothing
 }
 
-void 
+void
 Vault_Server_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr
              TAO_ENV_ARG_DECL_NOT_USED)
@@ -313,7 +314,7 @@ Vault_Client_Request_Context_Interceptor::send_request (
 
 }
 
-void 
+void
 Vault_Client_Request_Context_Interceptor::receive_other (
                PortableInterceptor::ClientRequestInfo_ptr
                TAO_ENV_ARG_DECL_NOT_USED
@@ -353,8 +354,9 @@ Vault_Client_Request_Context_Interceptor::receive_exception (
   CORBA::String_var exception_id =
     rinfo->received_exception_id (ACE_TRY_ENV);
 
-  // Check for exception id mismatch
-  ACE_ASSERT (ACE_OS::strcmp (id, exception_id.in ()) == 0);
+  if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
+    ACE_ERROR ((LM_ERROR, "Mismatched exception ids %s != %s\n",
+                id, exception_id.in ()));
 }
 
 
@@ -437,7 +439,7 @@ Vault_Server_Request_Context_Interceptor::send_exception (
 {
 }
 
-void 
+void
 Vault_Server_Request_Context_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr
              TAO_ENV_ARG_DECL_NOT_USED)
@@ -537,7 +539,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply (
 
 }
 
-void 
+void
 Vault_Client_Request_Dynamic_Interceptor::receive_other (
                PortableInterceptor::ClientRequestInfo_ptr
                TAO_ENV_ARG_DECL_NOT_USED
@@ -568,8 +570,9 @@ Vault_Client_Request_Dynamic_Interceptor::receive_exception (
   CORBA::String_var exception_id =
     rinfo->received_exception_id (ACE_TRY_ENV);
 
-  // Check for exception id mismatch
-  ACE_ASSERT (ACE_OS::strcmp (id, exception_id.in ()) == 0);
+  if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
+    ACE_ERROR ((LM_ERROR, "Mismatched exception ids %s != %s\n",
+                id, exception_id.in ()));
 }
 
 
@@ -668,7 +671,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_exception (
 {
 }
 
-void 
+void
 Vault_Server_Request_Dynamic_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr
              TAO_ENV_ARG_DECL_NOT_USED)
@@ -730,7 +733,7 @@ Vault_Client_Request_NOOP_Interceptor::send_request (
 
 }
 
-void 
+void
 Vault_Client_Request_NOOP_Interceptor::receive_other (
                PortableInterceptor::ClientRequestInfo_ptr
                TAO_ENV_ARG_DECL_NOT_USED
@@ -770,8 +773,9 @@ Vault_Client_Request_NOOP_Interceptor::receive_exception (
   CORBA::String_var exception_id =
     rinfo->received_exception_id (ACE_TRY_ENV);
 
-  // Check for exception id mismatch
-  ACE_ASSERT (ACE_OS::strcmp (id, exception_id.in ()) == 0);
+  if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
+    ACE_ERROR ((LM_ERROR, "Mismatched exception ids %s != %s\n",
+                id, exception_id.in ()));
 }
 
 
@@ -843,7 +847,7 @@ Vault_Server_Request_NOOP_Interceptor::send_exception (
 {
 }
 
-void 
+void
 Vault_Server_Request_NOOP_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr
              TAO_ENV_ARG_DECL_NOT_USED)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
index 32e23f423a9..b7da06bf284 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
@@ -246,12 +246,14 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr rinfo
-    TAO_ENV_ARG_DECL_NOT_USED)
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
+  TAO_ENV_ARG_DEFN;
+
   CORBA::String_var operation =
-    rinfo->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+    rinfo->operation (ACE_TRY_ENV);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -261,12 +263,12 @@ Echo_Server_Request_Interceptor::send_exception (
 
 
   CORBA::Any_var any =
-    rinfo->sending_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+    rinfo->sending_exception (ACE_TRY_ENV);
   ACE_CHECK;
 
   CORBA::TypeCode_var type = any->type ();
 
-  const char *exception_id = type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *exception_id = type->id (ACE_TRY_ENV);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile
index ba9713bf2f8..d5a0770c3aa 100644
--- a/TAO/utils/catior/Makefile
+++ b/TAO/utils/catior/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO
+LDLIBS = -lTAO_Strategies -lTAO
 
 BIN   	= catior
 
@@ -199,6 +199,8 @@ include $(TAO_ROOT)/taoconfig.mk
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
@@ -357,8 +359,6 @@ include $(TAO_ROOT)/taoconfig.mk
  $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
@@ -371,9 +371,10 @@ include $(TAO_ROOT)/taoconfig.mk
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(TAO_ROOT)/tao/IIOP_Endpoint.i \
  $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(TAO_ROOT)/tao/UIOP_Profile.h \
- $(TAO_ROOT)/tao/UIOP_Connect.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
+ $(TAO_ROOT)/tao/Strategies/UIOP_Profile.h \
+ $(TAO_ROOT)/tao/Strategies/strategies_export.h \
+ $(TAO_ROOT)/tao/Strategies/UIOP_Connect.h \
+ $(TAO_ROOT)/tao/Strategies/UIOP_Transport.h \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
@@ -407,15 +408,15 @@ include $(TAO_ROOT)/taoconfig.mk
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(TAO_ROOT)/tao/UIOP_Transport.i \
+ $(TAO_ROOT)/tao/Strategies/UIOP_Transport.i \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Connect.i \
- $(TAO_ROOT)/tao/UIOP_Endpoint.h \
- $(TAO_ROOT)/tao/UIOP_Endpoint.i \
- $(TAO_ROOT)/tao/UIOP_Profile.i
+ $(TAO_ROOT)/tao/Strategies/UIOP_Connect.i \
+ $(TAO_ROOT)/tao/Strategies/UIOP_Endpoint.h \
+ $(TAO_ROOT)/tao/Strategies/UIOP_Endpoint.i \
+ $(TAO_ROOT)/tao/Strategies/UIOP_Profile.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index cdbfc96496b..35ff01969b0 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -20,7 +20,7 @@
 #include "ace/streams.h"
 #include "tao/corba.h"
 #include "tao/IIOP_Profile.h"
-#include "tao/UIOP_Profile.h"
+#include "tao/Strategies/UIOP_Profile.h"
 
 static CORBA::Boolean
 catiiop (char* string,