*** empty log message ***

6 files changed, 35 insertions, 36 deletions

diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 73e623cd75b..1696443b972 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -366,8 +366,8 @@ TAO_Offer_Exporter::create_offers (void)
   char name[BUFSIZ];
   char description[BUFSIZ];
   CORBA::Any extra_info;
-  TAO_Sequences::StringSeq string_seq (QUEUE_SIZE);
-  TAO_Sequences::ULongSeq ulong_seq (QUEUE_SIZE);
+  TAO_Trader_Test::StringSeq string_seq (QUEUE_SIZE);
+  TAO_Trader_Test::ULongSeq ulong_seq (QUEUE_SIZE);
 
   CosTradingDynamic::DynamicProp* dp_user_queue;
   CosTradingDynamic::DynamicProp* dp_file_queue;
@@ -394,22 +394,22 @@ TAO_Offer_Exporter::create_offers (void)
 
       dp_user_queue = this->dp_plotters_[i].construct_dynamic_prop
 	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE],
-	 TAO_Sequences::_tc_StringSeq,
+	 TAO_Trader_Test::_tc_StringSeq,
 	 extra_info);
 
       dp_file_queue = this->dp_plotters_[i].construct_dynamic_prop
 	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING],
-	 TAO_Sequences::_tc_ULongSeq,
+	 TAO_Trader_Test::_tc_ULongSeq,
 	 extra_info);
       
       this->dp_plotters_[i].register_handler
 	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE],
-	 new Simple_DP_Evaluation_Handler<TAO_Sequences::StringSeq> (string_seq),
+	 new Simple_DP_Evaluation_Handler<TAO_Trader_Test::StringSeq> (string_seq),
 	 CORBA::B_TRUE);
 
       this->dp_plotters_[i].register_handler
 	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING],
-	 new Simple_DP_Evaluation_Handler<TAO_Sequences::ULongSeq> (ulong_seq),
+	 new Simple_DP_Evaluation_Handler<TAO_Trader_Test::ULongSeq> (ulong_seq),
 	 CORBA::B_TRUE);
       
       this->props_plotters_[i].length (11);
@@ -454,22 +454,22 @@ TAO_Offer_Exporter::create_offers (void)
 
       dp_user_queue = this->dp_printers_[i].construct_dynamic_prop
 	(TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_USER_QUEUE],
-	 TAO_Sequences::_tc_StringSeq,
+	 TAO_Trader_Test::_tc_StringSeq,
 	 extra_info);
 
       dp_file_queue = this->dp_printers_[i].construct_dynamic_prop
 	(TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_FILE_SIZES_PENDING],
-	 TAO_Sequences::_tc_ULongSeq,
+	 TAO_Trader_Test::_tc_ULongSeq,
 	 extra_info);
       
       this->dp_printers_[i].register_handler
 	(TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_USER_QUEUE],
-	 new Simple_DP_Evaluation_Handler<TAO_Sequences::StringSeq> (string_seq),
+	 new Simple_DP_Evaluation_Handler<TAO_Trader_Test::StringSeq> (string_seq),
 	 CORBA::B_TRUE);
 
       this->dp_printers_[i].register_handler
 	(TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_FILE_SIZES_PENDING],
-	 new Simple_DP_Evaluation_Handler<TAO_Sequences::ULongSeq> (ulong_seq),
+	 new Simple_DP_Evaluation_Handler<TAO_Trader_Test::ULongSeq> (ulong_seq),
 	 CORBA::B_TRUE);
 
       this->props_printers_[i].length (12);
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index d0e876d6739..099b3e1ba5b 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -394,13 +394,13 @@ TAO_Service_Type_Exporter::create_types (void)
   this->type_structs_[TT_Info::PLOTTER].props[4].name       =
     TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE];
   this->type_structs_[TT_Info::PLOTTER].props[4].value_type =
-    CORBA::TypeCode::_duplicate (TAO_Sequences::_tc_StringSeq);
+    CORBA::TypeCode::_duplicate (TAO_Trader_Test::_tc_StringSeq);
   this->type_structs_[TT_Info::PLOTTER].props[4].mode       =
     CosTradingRepos::ServiceTypeRepository::PROP_NORMAL;
   this->type_structs_[TT_Info::PLOTTER].props[5].name       =
     TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING];
   this->type_structs_[TT_Info::PLOTTER].props[5].value_type =
-    CORBA::TypeCode::_duplicate (TAO_Sequences::_tc_ULongSeq);
+    CORBA::TypeCode::_duplicate (TAO_Trader_Test::_tc_ULongSeq);
   this->type_structs_[TT_Info::PLOTTER].props[5].mode       =
     CosTradingRepos::ServiceTypeRepository::PROP_NORMAL;
   this->type_structs_[TT_Info::PLOTTER].if_name =
@@ -443,13 +443,13 @@ TAO_Service_Type_Exporter::create_types (void)
   this->type_structs_[TT_Info::PRINTER].props[5].name       =
     TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_USER_QUEUE];
   this->type_structs_[TT_Info::PRINTER].props[5].value_type =
-    CORBA::TypeCode::_duplicate (TAO_Sequences::_tc_StringSeq);
+    CORBA::TypeCode::_duplicate (TAO_Trader_Test::_tc_StringSeq);
   this->type_structs_[TT_Info::PRINTER].props[5].mode       =
     CosTradingRepos::ServiceTypeRepository::PROP_NORMAL;
   this->type_structs_[TT_Info::PRINTER].props[6].name       =
     TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_FILE_SIZES_PENDING];
   this->type_structs_[TT_Info::PRINTER].props[6].value_type =
-    CORBA::TypeCode::_duplicate (TAO_Sequences::_tc_ULongSeq);
+    CORBA::TypeCode::_duplicate (TAO_Trader_Test::_tc_ULongSeq);
   this->type_structs_[TT_Info::PRINTER].props[6].mode       =
     CosTradingRepos::ServiceTypeRepository::PROP_NORMAL;
   this->type_structs_[TT_Info::PRINTER].if_name =
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index 370f1a03161..6df30568244 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -159,23 +159,23 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq)
 
       if (tc == 0)
 	continue;
-      else if (tc->equal (TAO_Sequences::_tc_StringSeq, env))
+      else if (tc->equal (TAO_Trader_Test::_tc_StringSeq, env))
 	{
-	  TAO_Sequences::StringSeq* str_seq_ptr;
+	  TAO_Trader_Test::StringSeq* str_seq_ptr;
 	  (*value) >>= str_seq_ptr;
 
-	  TAO_Sequences::StringSeq_var str_seq (str_seq_ptr);
+	  TAO_Trader_Test::StringSeq_var str_seq (str_seq_ptr);
 	  for (int length = str_seq->length (), i = 0; i < length; i++)
 	    ACE_DEBUG ((LM_DEBUG, "%s ", (const char *) str_seq[i]));
 
 	  ACE_DEBUG ((LM_DEBUG, "\n"));
 	}
-      else if (tc->equal (TAO_Sequences::_tc_ULongSeq, env))
+      else if (tc->equal (TAO_Trader_Test::_tc_ULongSeq, env))
 	{
-	  TAO_Sequences::ULongSeq* ulong_seq_ptr;
+	  TAO_Trader_Test::ULongSeq* ulong_seq_ptr;
 	  (*value) >>= ulong_seq_ptr;
 
-	  TAO_Sequences::ULongSeq_var ulong_seq (ulong_seq_ptr);
+	  TAO_Trader_Test::ULongSeq_var ulong_seq (ulong_seq_ptr);
 	  for (int length = ulong_seq->length (), i = 0; i < length; i++)
 	    ACE_DEBUG ((LM_DEBUG, "%d ", ulong_seq[i]));
 
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index 13049256c56..24925fa78a6 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -4,7 +4,6 @@
 #define TAO_TRADER_TEST_UTILS_H
 
 #include "TTestS.h"
-#include "orbsvcs/SequencesC.h"
 #include "orbsvcs/CosTradingC.h"
 
 class TT_Info
diff --git a/TAO/orbsvcs/tests/Trading/TTest.idl b/TAO/orbsvcs/tests/Trading/TTest.idl
index 8594e59529c..63919c334a1 100644
--- a/TAO/orbsvcs/tests/Trading/TTest.idl
+++ b/TAO/orbsvcs/tests/Trading/TTest.idl
@@ -23,6 +23,15 @@ interface PostScript_Printer : Remote_Output
 {
 };
 
+typedef sequence<short> ShortSeq;
+typedef sequence<unsigned short> UShortSeq;
+typedef sequence<long> LongSeq;
+typedef sequence<unsigned long> ULongSeq;
+typedef sequence<boolean> BooleanSeq;
+typedef sequence<float> FloatSeq;
+typedef sequence<double> DoubleSeq;
+typedef sequence<string> StringSeq;
+
 };
 
 
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index 4e85779f658..7ba25ffc22d 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -23,7 +23,7 @@ main (int argc, char** argv)
       // Create a Service Type Repository and a Trader Object.
       TAO_Service_Type_Repository type_repos;
       auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader =
-	TAO_Trader_Factory::create_linked_trader ();
+	TAO_Trader_Factory::create_trader (argc, argv);
       TAO_Support_Attributes_Impl& sup_attr = trader->support_attributes ();
       TAO_Trading_Components_Impl& trd_comp = trader->trading_components ();
 
@@ -31,21 +31,12 @@ main (int argc, char** argv)
       sup_attr.type_repos (type_repos._this (TAO_TRY_ENV));
       TAO_CHECK_ENV;
 
-      // Obtain the Service Type Repository.
-      ACE_DEBUG ((LM_DEBUG, "Obtaining the Service Type Repository.\n"));
-      //CosTrading::TypeRepository_ptr obj = lookup_if->type_repos (TAO_TRY_ENV);
-      CosTrading::TypeRepository_ptr obj = sup_attr.type_repos ();
-      TAO_CHECK_ENV;
-      
-      // Narrow the Service Type Repository.
-      ACE_DEBUG ((LM_DEBUG, "Narrowing the Service Type Repository.\n"));
-      CosTradingRepos::ServiceTypeRepository_var tr =
-	CosTradingRepos::ServiceTypeRepository::_narrow (obj, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
       // Run the Service Type Exporter tests
       ACE_DEBUG ((LM_DEBUG, "Running the Service Type Exporter tests.\n"));
-      TAO_Service_Type_Exporter type_exporter (tr.ptr ());
+      TAO_Service_Type_Exporter type_exporter
+        (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       type_exporter.remove_all_types (TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -65,7 +56,7 @@ main (int argc, char** argv)
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "Running the Offer Exporter tests.\n"));
       TAO_Offer_Exporter offer_exporter
-	(CosTrading::Register::_duplicate (trd_comp.register_if ()),
+	(CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
 	 TAO_TRY_ENV);
       TAO_CHECK_ENV;