Wed Nov 16 14:12:08 USMST 2005 Yan Dai <dai_y@ociweb.com>

6 files changed, 54 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index 1fe608bd54c..414b0a3bd3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 16 14:12:08 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Disabled CSD tests on VxWorks builds. 
+          
 Tue Nov 15 23:41:39 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* ace/Service_Config.cpp (ACE_FACTORY_DEFINE):
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c1ed01fd343..1b50d69fedc 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Wed Nov 16 14:12:08 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl:
+        * tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl:
+        
+          Rolled back the changes 
+          "Sun Nov 13 12:15:58 USMST 2005  Yan Dai  <dai_y@ociweb.com>"
+          made for debugging test failures on VxWorks build.
+            
+        * NEWS:
+
+          Added description for CSD feature.
+          
 Wed Nov 16 11:23:15 2005  Jeff Parsons  <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/fe/idl.ll:
diff --git a/TAO/NEWS b/TAO/NEWS
index e08917d6714..d46efeb1a92 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -66,6 +66,11 @@ USER VISIBLE CHANGES BETWEEN TAO-1.4.7 and TAO-1.4.8
   and IORInterceptor_3_0. If you use IORInterceptors read the ChangeLog for
   the details, maybe you have to update your code!
 
+. Added the new Custom Servant Dispatching (CSD) feature to provide user 
+  applications with the ability to implement and "plug-in" custom strategies
+  to handle the dispatching of requests to servants. This new feature is not  
+  currently tested for VxWorks. See TAO release notes for more information. 
+
 USER VISIBLE CHANGES BETWEEN TAO-1.4.6 and TAO-1.4.7
 ====================================================
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
index cc920aa55a9..2b6b7382fab 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
@@ -63,7 +63,7 @@ interface Foo_B
 
   /// Client calls this last.  The last client to claim that it is
   /// done will cause the server to shutdown.
-  oneway void done();
+  void done();
 };
 
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl
index 00f7d36cf93..1ff6338702b 100755
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl
@@ -22,9 +22,9 @@ else {
 }
 
 $SV->Spawn ();
-print STDERR "timeout $PerlACE::wait_interval_for_process_creation\n";
+
 if (PerlACE::waitforfile_timed ($iorfile,
-                        2 * $PerlACE::wait_interval_for_process_creation) == -1) {
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/bin/tao_orb_tests.lst b/bin/tao_orb_tests.lst
index 5f3dc551ec2..f9f323ca49b 100644
--- a/bin/tao_orb_tests.lst
+++ b/bin/tao_orb_tests.lst
@@ -188,30 +188,30 @@ TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl:
 TAO/tests/CodeSets/simple/run_test.pl: !VxWorks !GIOP10 !STATIC
 TAO/tests/Hang_Shutdown/run_test.pl: !ST
 TAO/tests/Any/Recursive/run_test.pl:
-TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl collocated: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_orbthreads: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_servants: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_csdthreads: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_big: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl big: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl collocated: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_orbthreads: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_servants: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_csdthreads: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_big: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl big: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl collocated: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_orbthreads: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_servants: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_csdthreads: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_big: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl big: !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: !STATIC !ST
-TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: !ST
+TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl collocated: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_orbthreads: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_servants: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_csdthreads: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_big: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl big: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl collocated: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_orbthreads: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_servants: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_csdthreads: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_big: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl big: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl collocated: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_orbthreads: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_servants: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_csdthreads: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_big: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl big: !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: !STATIC !ST !VxWorks 
+TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: !ST !VxWorks